OSDN Git Service
Zack Rusin [Sat, 10 Jul 2010 01:19:28 +0000 (21:19 -0400)]
mesa: add basic support for 2D register arrays to mesa
just like in Gallium it's a basic functionality needed by a lot
of modern graphcis extensions
Vinson Lee [Sat, 10 Jul 2010 01:09:26 +0000 (18:09 -0700)]
r600: Fix include recursion.
r700_chip.h included r600_context.h, which included r700_chip.h.
Remove the unnecessary r600_context.h inclusion and add missing
headers.
Vinson Lee [Sat, 10 Jul 2010 00:34:40 +0000 (17:34 -0700)]
glslcompiler: Fix GCC warn_unused_result warning.
Vinson Lee [Fri, 9 Jul 2010 23:20:32 +0000 (16:20 -0700)]
glslcompiler: Fix memory leaks on error paths.
Vinson Lee [Fri, 9 Jul 2010 23:05:42 +0000 (16:05 -0700)]
glslcompiler: Remove unnecessary headers.
Vinson Lee [Fri, 9 Jul 2010 22:06:19 +0000 (15:06 -0700)]
mesa: Move [UN]CLAMPED_FLOAT_TO_UBYTE from imports.h to macros.h.
The other similar integer/float conversion macros are in macros.h.
Marek Olšák [Fri, 9 Jul 2010 18:22:20 +0000 (20:22 +0200)]
r300g: allow the GTT domain for samplers
This fixes sluggishness in vdrift.
Tom Stellard [Thu, 8 Jul 2010 21:40:48 +0000 (14:40 -0700)]
r300/compiler: Add a register rename pass.
This pass renames register in order to make it easier for the pair
scheduler to group TEX instructions together.
This fixes fdo bug #28606
Tom Stellard [Sun, 4 Jul 2010 19:30:52 +0000 (12:30 -0700)]
r300/compiler: Fix scheduling of TEX instructions.
The following instruction sequence will no longer be emitted in separate
TEX blocks:
0: TEX temp[0].xyz, temp[1].xy__, 2D[0];
1: TEX temp[1].xyz, temp[2].xy__, 2D[0];
This fixes fdo bug #25109
Marek Olšák [Fri, 9 Jul 2010 01:48:43 +0000 (03:48 +0200)]
r300g/swtcl: fix out-of-bounds write
This is a typo fix, the generated code should be the same.
Vinson Lee [Fri, 9 Jul 2010 00:54:47 +0000 (17:54 -0700)]
draw: Fix off-by-one error in assert.
textures is an array of size PIPE_MAX_VERTEX_SAMPLERS.
Brian Paul [Fri, 9 Jul 2010 00:35:08 +0000 (18:35 -0600)]
glsl: fix indirect addressing of gl_TextureMatrix[] arrays
The code to emit an array of OpenGL state vars lacked the code
to handle the gl_TextureMatrix[] array.
Fixes fd.o bug 28967
NOTE: this is a candidate for the 7.8 branch.
Kristian Høgsberg [Thu, 3 Jun 2010 02:48:06 +0000 (22:48 -0400)]
egl_dri2: Support _EGL_PLATFORM_DRM
This lets the egl_dri2 driver initialize on just a DRM fd.
Vinson Lee [Thu, 8 Jul 2010 23:06:01 +0000 (16:06 -0700)]
glslcompiler: Fix build.
Vinson Lee [Thu, 8 Jul 2010 22:58:23 +0000 (15:58 -0700)]
Merge branches 'master' and 'master' of ssh://git.freedesktop.org/git/mesa/mesa
Marek Olšák [Thu, 8 Jul 2010 22:16:49 +0000 (00:16 +0200)]
r300g: fix texturing with negative lod bias
This should fix FDO bugs #28437 and #28625.
Marek Olšák [Thu, 8 Jul 2010 20:32:39 +0000 (22:32 +0200)]
r300g: store/return the stride for winsys_handle in winsys
Eric Anholt [Thu, 8 Jul 2010 20:01:57 +0000 (13:01 -0700)]
i965: Add disasm for SEND mlen/rlen on Sandybridge.
Zhenyu Wang [Fri, 25 Jun 2010 08:05:24 +0000 (16:05 +0800)]
i965: Add 'wait' instruction support
When EU executes 'wait' instruction, it stalls and sets notification
register state. Host can issue MMIO write to clear notification
register state to allow EU continue on executing again.
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
Eric Anholt [Thu, 8 Jul 2010 19:35:48 +0000 (12:35 -0700)]
i965: Fix disasm of a SEND's mlen and rlen on Ironlake.
Zhenyu Wang [Tue, 29 Jun 2010 02:49:55 +0000 (10:49 +0800)]
i965: Add decode for Sandybridge DP write messages.
Zhenyu Wang [Tue, 29 Jun 2010 02:49:55 +0000 (10:49 +0800)]
i965: Add definitions for Sandybridge DP write/read messages.
Marek Olšák [Thu, 8 Jul 2010 19:36:47 +0000 (21:36 +0200)]
r300g: fix transfering compressed textures
Eric Anholt [Thu, 8 Jul 2010 19:12:54 +0000 (12:12 -0700)]
intel: Update intel_decode.c from intel-gpu-tools.
This came from commit
cf255e382d147fe3ca450f0dcec3525190e7dcbc
Brian Paul [Thu, 8 Jul 2010 17:03:44 +0000 (11:03 -0600)]
gallium: bump PIPE_MAX_SHADER_INPUTS/OUTPUTS to 32
Marek Olšák [Thu, 8 Jul 2010 04:20:01 +0000 (06:20 +0200)]
r300g: add a function for marking framebuffer atoms as dirty
Marek Olšák [Thu, 8 Jul 2010 04:16:09 +0000 (06:16 +0200)]
r300g: minor fixups
Brian Paul [Thu, 8 Jul 2010 15:22:52 +0000 (09:22 -0600)]
glsl: fix 'if ((x=foo()) > 1.0)' bug
Fixes fd.o bug 27216. May also be the root cause of fd.o bug 28950.
We weren't propogating the storage info for the x=foo() expression up
through the IR tree to the inequality expression.
NOTE: This is a candidate for the Mesa 7.8 branch.
Brian Paul [Thu, 8 Jul 2010 14:51:22 +0000 (08:51 -0600)]
st/mesa: additional assertions in st_translate_mesa_program()
Zack Rusin [Thu, 8 Jul 2010 04:33:31 +0000 (00:33 -0400)]
slang: fix typos
Zack Rusin [Wed, 7 Jul 2010 20:41:01 +0000 (16:41 -0400)]
slang: add some comments related to geometry shaders
Zack Rusin [Wed, 7 Jul 2010 04:54:33 +0000 (00:54 -0400)]
gs: inject const int gl_VerticesIn at link time
Brian Paul [Thu, 8 Jul 2010 02:26:33 +0000 (20:26 -0600)]
mesa: initial support for new GL 3.0 texture formats
Brian Paul [Wed, 7 Jul 2010 23:36:43 +0000 (17:36 -0600)]
gallivm: restore const qualifier
Brian Paul [Wed, 7 Jul 2010 23:27:10 +0000 (17:27 -0600)]
gallivm: fix cube map LOD computation
First, this undoes commit
e503af4baa2c709ae5743bb278b277d3faaba076
so we use iround() in lp_build_nearest_mip_level().
Second, in lp_build_sample_general() we need to check if we're sampling
a cube map before anything else. Choose the cube face and then recompute
the partial derivatives of (S,T) with respect to the chosen cube face.
Before, we were using the directional (S,T,R) derivatives to compute
the LOD.
Third, work around an apparent bug in LLVM 2.7 where setting the lod
variable to a const(0) value results in bad x86 code. See comments in
the code.
Brian Paul [Wed, 7 Jul 2010 19:04:47 +0000 (13:04 -0600)]
st/mesa: fix sampler max_lod computation
This change makes gallium behave like other GL implementations and fixes
a conformance failure.
Andre Maasikas [Wed, 7 Jul 2010 18:32:07 +0000 (21:32 +0300)]
r600: workaround 3 comp GL_SHORT vertex attribute format on r700
guess it's a hw errata?
Brian Paul [Wed, 7 Jul 2010 14:58:31 +0000 (08:58 -0600)]
glsl: use Elements() in arrays instead of sentinal values
The _slang_*_output_name() functions had one too many loop iterations
because of the sentinal end-of-list values in the vertOutput array.
Just use Elements() everywhere.
Vinson Lee [Wed, 7 Jul 2010 00:25:39 +0000 (17:25 -0700)]
llvmpipe: Don't build lp_test_round when using MSVC.
lp_test_round uses the math functions round and trunc, which aren't
available with MSVC.
Fixes the MSVC build for now.
Vinson Lee [Tue, 6 Jul 2010 23:18:32 +0000 (16:18 -0700)]
llvmpipe: Add lp_test_round to SCons build.
Vinson Lee [Tue, 6 Jul 2010 23:02:49 +0000 (16:02 -0700)]
egl: Remove unnecessary headers.
Vinson Lee [Tue, 6 Jul 2010 22:49:40 +0000 (15:49 -0700)]
draw: Remove unnecessary header.
Vinson Lee [Tue, 6 Jul 2010 22:45:31 +0000 (15:45 -0700)]
gallivm: Remove unnecessary header.
Marek Olšák [Tue, 6 Jul 2010 22:01:27 +0000 (00:01 +0200)]
util: print help for debug options on non-debug builds
I'd like to see the help when I request it.
Brian Paul [Tue, 6 Jul 2010 19:22:54 +0000 (13:22 -0600)]
gallivm: use trunc, not round in lp_build_nearest_mip_level()
Fixes fd.o bug 28036 (piglit fbo-cubemap.c regression)
Brian Paul [Tue, 6 Jul 2010 17:36:01 +0000 (11:36 -0600)]
llvmpipe: add test program for round(), trunc(), floor(), ceil()
Brian Paul [Tue, 6 Jul 2010 17:33:56 +0000 (11:33 -0600)]
gallivm: finish implementation of lp_build_iceil()
Plus fix minor error in lp_build_iceil() by tweaking the offset value.
And add a bunch of comments for the round(), trunc(), floor(), ceil()
functions.
Zack Rusin [Tue, 6 Jul 2010 17:27:31 +0000 (13:27 -0400)]
llvmpipe: disconnect vertex texture sampling from the setup
it was wrong to put this in the fs paths, but it was easier to just
stuff it along the fragment texture sampling paths. the patch
disconnects vertex texture sampling and just maps the textures
before the draw itself and unmaps them after.
Zack Rusin [Tue, 6 Jul 2010 16:35:23 +0000 (12:35 -0400)]
draw: make sure softpipe doesn't crash with vertex tex sampling
softpipe doesn't implement the draw's llvm tex sampling interface
so make sure draw can handle the cases where the driver doesn't
implement the interface
Zack Rusin [Mon, 14 Jun 2010 14:18:09 +0000 (10:18 -0400)]
draw: implement vertex texture sampling using llvm
Tom Stellard [Mon, 5 Jul 2010 20:01:17 +0000 (13:01 -0700)]
r300/compiler: Implement KILP opcode.
Signed-off-by: Marek Olšák <maraeo@gmail.com>
José Fonseca [Mon, 14 Jun 2010 15:23:13 +0000 (16:23 +0100)]
gallivm: Use SSE4.1's BLENDV instructions for lp_build_select().
José Fonseca [Tue, 15 Jun 2010 14:34:16 +0000 (15:34 +0100)]
gallivm: Fix 8bit comparisons.
Alan Hourihane [Tue, 6 Jul 2010 10:42:18 +0000 (11:42 +0100)]
llvmpipe: ensure all bins are reset avoids memory corruption.
Chia-I Wu [Tue, 6 Jul 2010 08:27:20 +0000 (16:27 +0800)]
mesa: Always initialize transform feedback state.
Assert ctx->Driver.NewTransformFeedback if the feature is enabled; Use
the default callbacks otherwise. The rest of core mesa expects the
state to be initialized.
Chia-I Wu [Sun, 4 Jul 2010 07:55:12 +0000 (15:55 +0800)]
egl: Rework driver loading.
Driver loading is now splitted into two stages. In the first stage, an
_EGLModule is created for each driver: user driver, default drivers, and
all files in the search directories that start with "egl_". Modules are
not loaded at this stage.
In the second stage, each module is loaded to initialize a display. The
process stops at the first module that can initialize the display.
If eglGetProcAddress is called before eglInitialize, the same code path
will be taken to find the first module that supports
EGL_DEFAULT_DISPLAY. Because we do not want to initialize the display,
drv->Probe is used instead in this case.
Chia-I Wu [Tue, 6 Jul 2010 06:34:43 +0000 (14:34 +0800)]
st/egl: Add support for !GLX_DIRECT_RENDERING.
st/egl uses GLX code for DRI2 support. It should honor
GLX_DIRECT_RENDERING.
Also updates configure.ac to define GLX_DIRECT_RENDERING for st/egl.
Brian Paul [Tue, 6 Jul 2010 02:07:07 +0000 (20:07 -0600)]
mesa: initial support for unnormalized integer texture formats
As defined by GL_EXT_texture_integer.
Corbin Simpson [Mon, 5 Jul 2010 21:59:12 +0000 (14:59 -0700)]
auxiliary/util: Add SM3 meta-cap list.
Roland Scheidegger [Mon, 5 Jul 2010 15:17:50 +0000 (17:17 +0200)]
llvmpipe: wait for queries being finished when asked for it or before deletion
This fixes bug #28757, though does not yet address the issue that fences aren't
always emitted.
Vinson Lee [Sun, 4 Jul 2010 18:34:15 +0000 (11:34 -0700)]
i915g: Remove unnecessary header.
Jakob Bornecrantz [Sat, 3 Jul 2010 12:04:10 +0000 (13:04 +0100)]
i915g: Add flag to not send commands to hw
Jakob Bornecrantz [Sat, 3 Jul 2010 12:00:50 +0000 (13:00 +0100)]
i915g: If the kernel reject the batchbuffer print it then assert
Jakob Bornecrantz [Sat, 3 Jul 2010 11:56:35 +0000 (12:56 +0100)]
i915g: Minor cleanups
Jakob Bornecrantz [Sat, 3 Jul 2010 14:25:17 +0000 (15:25 +0100)]
i915g: Make batchbuffer flush function not be inline
Jakob Bornecrantz [Sun, 4 Jul 2010 09:24:59 +0000 (10:24 +0100)]
i915g: Rename texture state to map state
Jakob Bornecrantz [Sat, 3 Jul 2010 11:46:42 +0000 (12:46 +0100)]
i915g: Move fragment state to its own file
Jakob Bornecrantz [Sun, 4 Jul 2010 09:19:44 +0000 (10:19 +0100)]
i915g: Move static state to its own file
Jakob Bornecrantz [Sat, 3 Jul 2010 11:47:49 +0000 (12:47 +0100)]
i915g: Don't dirty dynamic state if it hasn't changed
Jakob Bornecrantz [Sun, 4 Jul 2010 08:54:20 +0000 (09:54 +0100)]
i915g: Don't flush after blit
Jakob Bornecrantz [Sat, 3 Jul 2010 11:30:46 +0000 (12:30 +0100)]
i915g: Don't flush empty batchbuffers
Jakob Bornecrantz [Sun, 4 Jul 2010 00:35:05 +0000 (01:35 +0100)]
gallium: Make trivial examples use target helpers
Jakob Bornecrantz [Sun, 4 Jul 2010 00:34:39 +0000 (01:34 +0100)]
gallium: Fix compilation of trivial quad-tex
Vinson Lee [Sun, 4 Jul 2010 02:28:31 +0000 (19:28 -0700)]
st/egl: Remove unnecessary headers.
Chia-I Wu [Sat, 3 Jul 2010 09:18:40 +0000 (17:18 +0800)]
docs: Update EGL doc.
Updated for the reorganization of st/egl targets.
Chia-I Wu [Sat, 3 Jul 2010 08:41:55 +0000 (16:41 +0800)]
mesa: Fix OpenGL ES-only builds.
Check FEATURE_GL in _mesa_init_shader_dispatch and
_mesa_init_shader_uniform_dispatch. OpenGL ES can not and does not use
_mesa_init_<...>_dispatch. This is supposed to be temporary. Ideally,
a more flexible way for initializing dispatch tables should be
developed.
nobled [Fri, 2 Jul 2010 23:38:07 +0000 (19:38 -0400)]
egl: Always use EGLAPIENTRY in api function prototypes
Fixes the build on Windows.
Vinson Lee [Sat, 3 Jul 2010 08:04:50 +0000 (01:04 -0700)]
gallivm: Remove unnecessary headers.
Marek Olšák [Sat, 3 Jul 2010 02:15:06 +0000 (04:15 +0200)]
r300g: fix warnings
Tom Stellard [Fri, 25 Jun 2010 01:45:46 +0000 (18:45 -0700)]
r300/compiler: Fix loop unrolling
Tom Stellard [Sat, 19 Jun 2010 04:20:57 +0000 (21:20 -0700)]
r300/compiler: Use hardware flow control instructions for loops on r500.
Tom Stellard [Sat, 19 Jun 2010 03:48:42 +0000 (20:48 -0700)]
r300g: Fix typo in r300_reg.h
Tom Stellard [Sat, 19 Jun 2010 03:42:33 +0000 (20:42 -0700)]
r300/compiler: Don't continue copy propagation inside loops.
Tom Stellard [Tue, 15 Jun 2010 08:46:47 +0000 (01:46 -0700)]
r300/compiler: Print debug info for flow control instructions.
Tom Stellard [Tue, 15 Jun 2010 08:42:06 +0000 (01:42 -0700)]
r300/compiler: Enable hardware IF statements for r500 cards.
Tom Stellard [Tue, 15 Jun 2010 05:30:02 +0000 (22:30 -0700)]
r300/compiler: In the peephole optimizer, ELSE should mark the end of a
block.
Tom Stellard [Sun, 13 Jun 2010 05:12:32 +0000 (22:12 -0700)]
r300/compiler: Correctly calculate the max number of iterations for loops.
Tom Stellard [Sat, 12 Jun 2010 06:09:36 +0000 (23:09 -0700)]
r300/compiler: Handle loops in deadcode analysis.
This also allows us to split the loop emulation into two phases. A
tranformation phase which either unrolls loops or prepares them to be
emulated, and the emulation phase which unrolls remaining loops until the
instruction limit is reached. The second phase is completed after the
deadcode analysis in order to get a more accurate count of the number of
instructions in the body of loops.
Brian Paul [Sat, 3 Jul 2010 00:18:15 +0000 (18:18 -0600)]
osmesa: remove old renderbuffer before adding new
Fixes fd.o bug 10966 when OSMesaMakeCurrent() was called twice.
NOTE: This is a candidate for the 7.8 branch.
Brian Paul [Fri, 2 Jul 2010 18:22:33 +0000 (12:22 -0600)]
mesa: updated instruction comments
Brian Paul [Fri, 2 Jul 2010 21:34:58 +0000 (15:34 -0600)]
mesa: add geometry shader fields to gl_shader_program
These 3 fields are per shader-program. Copy them into the geometry
program at link time for convenient access later.
Also, add some missing glGetProgramiv() queries.
José Fonseca [Fri, 2 Jul 2010 17:42:49 +0000 (18:42 +0100)]
gallivm: Do 4ubyte AoS texture filtering for any format that can be expressed.
Except if it has only one channel, as it would take the same number of
instructions.
José Fonseca [Fri, 2 Jul 2010 17:38:50 +0000 (18:38 +0100)]
gallivm: Use util_format_description::fetch_rgba_8unorm() when available.
José Fonseca [Fri, 2 Jul 2010 17:38:11 +0000 (18:38 +0100)]
util: Add a fetch_rgba_8unorm.
Not always implemented, but useful in situations where we want 8unorms
and the samples comes as 8unorms as we needlessly convert to/from
floats.
José Fonseca [Fri, 2 Jul 2010 17:36:43 +0000 (18:36 +0100)]
gallivm: Support multiple pixels in lp_build_fetch_rgba_aos().
This allows to do the unpacking of formats that fit in 4 x unorm8 in
parallel, 4 pixels at a time.
José Fonseca [Fri, 2 Jul 2010 15:59:39 +0000 (16:59 +0100)]
gallivm: Move lp_build_rgba8_to_f32_soa() to lp_bld_format_soa.c
It will be more useful here.
José Fonseca [Fri, 2 Jul 2010 15:57:57 +0000 (16:57 +0100)]
gallivm: Move gather functions to its own module.
They need to grow, and they provide basic functionality which is not
specific to sampling.
José Fonseca [Fri, 2 Jul 2010 15:55:27 +0000 (16:55 +0100)]
gallivm: Check inputs/outputs in lp_build_conv()
José Fonseca [Fri, 2 Jul 2010 15:52:19 +0000 (16:52 +0100)]
util: Expose util_format_fits_8unorm().
Brian Paul [Fri, 2 Jul 2010 16:16:05 +0000 (10:16 -0600)]
mesa: fix texenv generation when num color bufs == 0
Before, if there were no color buffers enabled (with glDrawBuffers(GL_NONE))
when the texenv program was generated, we'd emit writes to OUTPUT[1] but
the OutputsWritten mask was 0. This inconsistency caused an assertion to
fail later in the Mesa->TGSI translation.
Fixes fd.o bug 28169
NOTE: this is a candidate for the 7.8 branch (and depends on commit
b6b9b17d27c570cc99ae339e595cf2f63ca5e8d7).