Maciej Cencora [Sun, 18 Oct 2009 16:06:51 +0000 (18:06 +0200)]
r300g: add some texture formats
Corbin Simpson [Wed, 28 Oct 2009 18:47:24 +0000 (11:47 -0700)]
r300g: Clear up a bit of the buffer reference stuff.
Still need to actually get reference info from winsys somehow. Doing added
buffers is easy, but knowing whether a flush has happened is a bit tricky.
Corbin Simpson [Wed, 28 Oct 2009 17:02:23 +0000 (10:02 -0700)]
r300g: Fix XXX.
Nothing strange here.
Marek Olšák [Wed, 28 Oct 2009 01:43:51 +0000 (02:43 +0100)]
r300g: fix emitting the stencil-ref and alpha-ref values
Signed-off-by: Corbin Simpson <MostAwesomeDude@gmail.com>
DSA really needs its head examined someday. ~ C.
Marek Olšák [Wed, 28 Oct 2009 01:21:49 +0000 (02:21 +0100)]
r300g: fix the WRAP_T mode when using 1D textures
Signed-off-by: Corbin Simpson <MostAwesomeDude@gmail.com>
Marek Olšák [Wed, 28 Oct 2009 01:19:52 +0000 (02:19 +0100)]
r300g: fix blending and do some optimizations
Signed-off-by: Corbin Simpson <MostAwesomeDude@gmail.com>
Marek Olšák [Wed, 28 Oct 2009 00:38:40 +0000 (01:38 +0100)]
mesa/st: fix crash in st_texture_image_copy
Signed-off-by: Corbin Simpson <MostAwesomeDude@gmail.com>
Brian Paul [Wed, 28 Oct 2009 17:33:51 +0000 (11:33 -0600)]
Merge branch 'mesa_7_6_branch'
Conflicts:
src/mesa/shader/lex.yy.c
src/mesa/shader/program_lexer.l
Brian Paul [Wed, 28 Oct 2009 17:13:21 +0000 (11:13 -0600)]
mesa: remove unneeded #includes
Brian Paul [Wed, 28 Oct 2009 17:11:30 +0000 (11:11 -0600)]
mesa: include imports.h to silence warning
Vinson Lee [Wed, 28 Oct 2009 17:09:50 +0000 (11:09 -0600)]
intel: Fix memory leak in event of mip tree allocation failure
Signed-off-by: Brian Paul <brianp@vmware.com>
José Fonseca [Wed, 28 Oct 2009 11:05:32 +0000 (11:05 +0000)]
llvmpipe: Make sure the JIT engine and X86 target are linked on MSVC build.
Basically mimic the llvm 2.6 way of linking execution engines and
targets.
José Fonseca [Tue, 27 Oct 2009 20:45:53 +0000 (20:45 +0000)]
util: Drop return value from cpuid().
José Fonseca [Tue, 27 Oct 2009 20:29:19 +0000 (20:29 +0000)]
util: Fix cpuid on MSVC.
José Fonseca [Tue, 27 Oct 2009 20:09:53 +0000 (20:09 +0000)]
llvmpipe: Implement round() for MSVC.
Brian Paul [Wed, 28 Oct 2009 03:39:44 +0000 (21:39 -0600)]
mesa: consolidate _mesa_CompressedTexSubImage[123]DARB() functions
Brian Paul [Wed, 28 Oct 2009 03:03:44 +0000 (21:03 -0600)]
mesa: consolidate CompressedTexSubImage1/2/3DARB() error checking
Brian Paul [Wed, 28 Oct 2009 03:15:36 +0000 (21:15 -0600)]
mesa: simplify teximage code with get_current_tex_object()
Brian Paul [Wed, 28 Oct 2009 02:10:30 +0000 (20:10 -0600)]
mesa: code refactoring to eliminate a switch stmt in bind_buffer_object()
Brian Paul [Wed, 28 Oct 2009 02:09:33 +0000 (20:09 -0600)]
glsl: avoid redundant state changes in _mesa_use_program()
Zack Rusin [Sun, 25 Oct 2009 16:19:38 +0000 (12:19 -0400)]
st/xorg: fix xv
Ian Romanick [Tue, 27 Oct 2009 20:40:18 +0000 (13:40 -0700)]
ARB prog parser: Fix epic memory leak in lexer / parser interface
Anything that matched IDENTIFIER was strdup'ed and returned to the
parser. However, almost every case of IDENTIFIER in the parser just
dropped the returned string on the floor. Every swizzle string, every
option string, every use of a variable, etc. leaked memory.
Create a temporary buffer in the parser state (string_dumpster and
dumpster_size). Return strings from the lexer to the parser in the
buffer. Grow the buffer as needed. When the parser needs to keep a
string (i.e., delcaring a new variable), let it make a copy then.
The only leak that valgrind now detects is /occasionally/ the copy of
the program string in gl_program::String is leaked. I'm not seeing
how. :(
Ian Romanick [Tue, 27 Oct 2009 18:46:29 +0000 (11:46 -0700)]
ARB prog parser: Don't leak program string
The program string is kept in the program object. On the second call
into glProgramStringARB the previous kept string would be leaked.
Ian Romanick [Tue, 27 Oct 2009 18:44:56 +0000 (11:44 -0700)]
ARB prog parser: Don't leak symbol table header structures
Eric Anholt [Tue, 20 Oct 2009 21:51:53 +0000 (14:51 -0700)]
intel: Fix flipped condition in ARB_sync GetSYnciv(GL_SYNC_STATUS).
Bug #24435
(cherry picked from commit
d56125a298106d81e10674f1c4b3b43b51a5139d)
Brian Paul [Tue, 27 Oct 2009 23:34:29 +0000 (17:34 -0600)]
intel: added region draw_x/y offsets in x/y_tile_swizzle() funcs
This fixes the second part of bug 23552.
Brian Paul [Tue, 27 Oct 2009 23:01:26 +0000 (17:01 -0600)]
intel: silence warning
Brian Paul [Tue, 27 Oct 2009 22:59:23 +0000 (16:59 -0600)]
mesa: debug code for glBlitFramebuffer()
Brian Paul [Tue, 27 Oct 2009 22:55:31 +0000 (16:55 -0600)]
via: silence unused var warnings
Brian Paul [Tue, 27 Oct 2009 22:37:25 +0000 (16:37 -0600)]
intel: minor clean-up, comments
Brian Paul [Tue, 27 Oct 2009 22:37:00 +0000 (16:37 -0600)]
intel: use _mesa_get_current_tex_unit() helper
Brian Paul [Tue, 27 Oct 2009 20:16:59 +0000 (14:16 -0600)]
mesa: s/Bilt/Blit
Brian Paul [Tue, 27 Oct 2009 19:59:32 +0000 (13:59 -0600)]
mesa: more texture debug code changes, improvements
Brian Paul [Tue, 27 Oct 2009 19:52:37 +0000 (13:52 -0600)]
mesa: minor code clean-up in client_state()
Brian Paul [Tue, 27 Oct 2009 19:51:51 +0000 (13:51 -0600)]
mesa: avoid redundant state setting in glClientActiveTexture
Plus add code for verbose/debugging.
Brian Paul [Mon, 26 Oct 2009 23:00:48 +0000 (17:00 -0600)]
intel: fix comment, formatting
Brian Paul [Tue, 27 Oct 2009 22:46:07 +0000 (16:46 -0600)]
progs/tests: added new blitfb.c test
Tests glBlitFramebuffer() between two texture/renderbuffer surfaces.
In particular, blit from level[1] of a cube map face to a 2D texture.
Used to find/fix bug in intel do_copy_texsubimage().
See commit
aef1ab1073f3e30d699b99dae17518ed48b57c72
Brian Paul [Tue, 27 Oct 2009 22:39:01 +0000 (16:39 -0600)]
intel: fix src offset bug in do_copy_texsubimage()
Use src->draw_offset intead of zero. Zero usually worked, except when
the src renderbuffer is actually a texture mipmap level higher than zero.
Fixes progs/test/blitfb.c test.
Brian Paul [Tue, 27 Oct 2009 22:28:39 +0000 (16:28 -0600)]
glsl: fix memory leak
A slightly modified version of a patch from Vinson Lee.
Eric Anholt [Tue, 27 Oct 2009 17:26:09 +0000 (10:26 -0700)]
i915: Fix driver for the miptree x/y offset changes.
Bug #24734.
Brian Paul [Tue, 27 Oct 2009 15:31:31 +0000 (09:31 -0600)]
i965: be clear that the Fallback field is a boolean, not a bitfield
Brian Paul [Tue, 27 Oct 2009 15:27:44 +0000 (09:27 -0600)]
Revert "i965: fix hacked Fallback usage in brw_prepare_vertices()"
This reverts commit
8810b8f67135185d1044746bb861fe2ff997626c.
It turns out the i965 driver uses the intel->Fallback field as a boolean,
not as a bitmask. The intelFallback() function is a no-op in the i965
driver. It would have been nice if there were some comments about this.
I'll fix that next...
Vinson Lee [Tue, 27 Oct 2009 15:13:27 +0000 (09:13 -0600)]
draw: Fix memory leak.
This would only be hit if we got and invalid index_size.
Brian Paul [Mon, 26 Oct 2009 16:58:47 +0000 (10:58 -0600)]
docs: document Intel glBitmap fixes
Brian Paul [Mon, 26 Oct 2009 16:42:45 +0000 (10:42 -0600)]
intel: fix GL state bugs in intel_texture_bitmap()
Need to push texture state and polygon state too.
Fixes rendering glitches seen in progs/demos/engine when changing
the rendering mode (wireframe, texture modes).
This makes bitmap rendering a little slower, unfortunately.
Christoph Bumiller [Tue, 27 Oct 2009 23:30:45 +0000 (00:30 +0100)]
nv50: activate more lanes in a warp
Some cards have crippling defaults set and use only 4
of 32 lanes. This should activate 16 on these.
Those that allow 32 by default should still do so.
Found out by Marcin Kościelnicki.
Brian Paul [Tue, 27 Oct 2009 22:46:07 +0000 (16:46 -0600)]
progs/tests: added new blitfb.c test
Tests glBlitFramebuffer() between two texture/renderbuffer surfaces.
In particular, blit from level[1] of a cube map face to a 2D texture.
Used to find/fix bug in intel do_copy_texsubimage().
See commit
aef1ab1073f3e30d699b99dae17518ed48b57c72
Brian Paul [Tue, 27 Oct 2009 22:39:01 +0000 (16:39 -0600)]
intel: fix src offset bug in do_copy_texsubimage()
Use src->draw_offset intead of zero. Zero usually worked, except when
the src renderbuffer is actually a texture mipmap level higher than zero.
Fixes progs/test/blitfb.c test.
Brian Paul [Tue, 27 Oct 2009 22:28:39 +0000 (16:28 -0600)]
glsl: fix memory leak
A slightly modified version of a patch from Vinson Lee.
Eric Anholt [Tue, 27 Oct 2009 17:26:09 +0000 (10:26 -0700)]
i915: Fix driver for the miptree x/y offset changes.
Bug #24734.
Jakob Bornecrantz [Tue, 27 Oct 2009 16:35:06 +0000 (17:35 +0100)]
st/xorg: Adopt to new dirty clip rect type
Brian Paul [Tue, 27 Oct 2009 15:31:31 +0000 (09:31 -0600)]
i965: be clear that the Fallback field is a boolean, not a bitfield
Brian Paul [Tue, 27 Oct 2009 15:27:44 +0000 (09:27 -0600)]
Revert "i965: fix hacked Fallback usage in brw_prepare_vertices()"
This reverts commit
8810b8f67135185d1044746bb861fe2ff997626c.
It turns out the i965 driver uses the intel->Fallback field as a boolean,
not as a bitmask. The intelFallback() function is a no-op in the i965
driver. It would have been nice if there were some comments about this.
I'll fix that next...
Vinson Lee [Tue, 27 Oct 2009 15:13:27 +0000 (09:13 -0600)]
draw: Fix memory leak.
This would only be hit if we got and invalid index_size.
Vinson Lee [Mon, 26 Oct 2009 21:03:31 +0000 (15:03 -0600)]
progs/tests: Fix MSVC build.
Brian Paul [Mon, 26 Oct 2009 16:58:47 +0000 (10:58 -0600)]
docs: document Intel glBitmap fixes
Brian Paul [Mon, 26 Oct 2009 16:42:45 +0000 (10:42 -0600)]
intel: fix GL state bugs in intel_texture_bitmap()
Need to push texture state and polygon state too.
Fixes rendering glitches seen in progs/demos/engine when changing
the rendering mode (wireframe, texture modes).
This makes bitmap rendering a little slower, unfortunately.
José Fonseca [Mon, 26 Oct 2009 15:11:11 +0000 (15:11 +0000)]
scons: Define _USE_MATH_DEFINES on MSVC.
Brian Paul [Mon, 26 Oct 2009 15:05:58 +0000 (09:05 -0600)]
windows: added remap.[ch] to project files
Untested. Other updates may be needed to reflect the current source files.
Chia-I Wu [Mon, 26 Oct 2009 03:20:45 +0000 (20:20 -0700)]
mesa: Add remap.c to SConscript.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Zack Rusin [Sat, 24 Oct 2009 05:43:47 +0000 (01:43 -0400)]
st/xorg: initialize indexes before reswizzling for yuv
Zack Rusin [Sat, 24 Oct 2009 05:29:27 +0000 (01:29 -0400)]
st/xorg: stop overflowing yuv buffers
Zack Rusin [Sat, 24 Oct 2009 05:05:40 +0000 (01:05 -0400)]
st/xorg: add yuv vertex shader
plus some general fixes
Zack Rusin [Fri, 23 Oct 2009 20:18:10 +0000 (16:18 -0400)]
st/xorg: add yuv shaders
Marek Olšák [Mon, 26 Oct 2009 00:47:55 +0000 (01:47 +0100)]
r300g: read occlusion query results from both Z pipes on RV530
Marek Olšák [Mon, 26 Oct 2009 00:46:21 +0000 (01:46 +0100)]
r300g: add cubemap support
Also, set a pitch for rectangles only.
José Fonseca [Sun, 25 Oct 2009 21:11:54 +0000 (21:11 +0000)]
gallium: Move enum pipe_error into p_defines.h.
It's really just another define. No need for its own header.
José Fonseca [Sun, 25 Oct 2009 12:27:14 +0000 (12:27 +0000)]
llvmpipe: Human friendlier sampler state dump.
José Fonseca [Sun, 25 Oct 2009 12:26:39 +0000 (12:26 +0000)]
util: Human readable output of texture states.
José Fonseca [Sun, 25 Oct 2009 11:49:01 +0000 (11:49 +0000)]
llvmpipe: Dump the sampler state of the shader key.
José Fonseca [Sun, 25 Oct 2009 11:48:17 +0000 (11:48 +0000)]
llvmpipe: Immediate multiplication.
José Fonseca [Sun, 25 Oct 2009 09:51:57 +0000 (09:51 +0000)]
llvmpipe: Fast path for sampling rgba8 textures with linear filtering.
Implement Keith's suggestion of doing most of the sampling with 16x8
and 8x16 AoS, and only doing the conversion to floating point SoA at
the very last step.
Improves gloss performance by 10%.
José Fonseca [Sun, 25 Oct 2009 09:16:38 +0000 (09:16 +0000)]
llvmpipe: Make lerping work for 8.8 fixed point values.
José Fonseca [Sun, 25 Oct 2009 09:09:59 +0000 (09:09 +0000)]
llvmpipe: New module to help make assertions about formats.
José Fonseca [Sun, 25 Oct 2009 09:09:23 +0000 (09:09 +0000)]
llvmpipe: New function to unpack rgba8 formats into 4 x u8n AoS.
José Fonseca [Sun, 25 Oct 2009 09:06:05 +0000 (09:06 +0000)]
llvmpipe: Split the format swizzling step from the unpacking.
José Fonseca [Sun, 25 Oct 2009 09:03:50 +0000 (09:03 +0000)]
llvmpipe: Allow different signs when unpacking.
José Fonseca [Sun, 25 Oct 2009 09:03:18 +0000 (09:03 +0000)]
llvmpipe: Add inlines to quickly generate types matching the native SIMD register bitwidth.
José Fonseca [Thu, 22 Oct 2009 21:44:32 +0000 (22:44 +0100)]
llvmpipe: Merge lp_build_load_rgba_soa into lp_build_sample_texel.
José Fonseca [Thu, 22 Oct 2009 21:37:06 +0000 (22:37 +0100)]
llvmpipe: Factor our pixel offset computation.
José Fonseca [Thu, 22 Oct 2009 20:16:26 +0000 (21:16 +0100)]
llvmpipe: Share testing infrastructure with lp_test_format.
José Fonseca [Thu, 22 Oct 2009 20:06:03 +0000 (21:06 +0100)]
llvmpipe: Eliminate lp_build_store_rgba_aos.
José Fonseca [Thu, 22 Oct 2009 19:58:35 +0000 (20:58 +0100)]
llvmpipe: Eliminate lp_build_load_rgba_aos.
José Fonseca [Thu, 22 Oct 2009 19:42:16 +0000 (20:42 +0100)]
llvmpipe: Move a few format/sampling functions into better space.
Marek Olšák [Sun, 25 Oct 2009 08:57:53 +0000 (09:57 +0100)]
r300g: fix redefining mipmaps and fetching from them
Marek Olšák [Sun, 25 Oct 2009 04:05:27 +0000 (05:05 +0100)]
r300g: added support for 3D textures
Mipmaps not tested. Also, I am not sure why piglit/texturing/tex3d needs
to have color tolerance +-1 to pass. The classic Mesa driver doesn't
need that.
Joakim Sindholt [Sat, 24 Oct 2009 00:38:28 +0000 (02:38 +0200)]
r300g: fix scons build yet again
Brian Paul [Sat, 24 Oct 2009 00:38:43 +0000 (18:38 -0600)]
Merge branch 'mesa_7_6_branch'
Brian Paul [Sat, 24 Oct 2009 00:15:55 +0000 (18:15 -0600)]
mesa: simplify att->CubeMapFace assignment
Brian Paul [Fri, 23 Oct 2009 22:31:48 +0000 (16:31 -0600)]
mesa: refactor, new print_shader_info()
Brian Paul [Fri, 23 Oct 2009 19:20:03 +0000 (13:20 -0600)]
mesa: rework error checking code for glGetCompressedTexImage()
Do all error checking in new getcompressedteximage_error_check() func.
Move some additional PBO checks out of the driver fallbacks into the
error checking functions.
Brian Paul [Fri, 23 Oct 2009 19:06:13 +0000 (13:06 -0600)]
mesa: remove misplaced VERBOSE_TEXTURE tests
Brian Paul [Fri, 23 Oct 2009 17:34:14 +0000 (11:34 -0600)]
mesa: more detailed error messages in fbo code
Brian Paul [Sat, 24 Oct 2009 00:21:59 +0000 (18:21 -0600)]
mesa: remove FBO texture depth/stencil test
The texture format should not be checked until validation time since
the format might be changed by a subsequent glTexImage() call.
Zack Rusin [Fri, 23 Oct 2009 13:35:36 +0000 (09:35 -0400)]
st/xorg: fix text with component alpha rendering
Brian Paul [Fri, 23 Oct 2009 22:36:15 +0000 (16:36 -0600)]
mesa: fix broken _mesa_str_checksum()
Eric Anholt [Fri, 23 Oct 2009 21:19:52 +0000 (14:19 -0700)]
Merge remote branch 'origin/mesa_7_6_branch'
Conflicts:
src/mesa/drivers/dri/intel/intel_fbo.c
src/mesa/drivers/dri/intel/intel_mipmap_tree.c
src/mesa/drivers/dri/intel/intel_mipmap_tree.h
src/mesa/drivers/dri/intel/intel_tex_copy.c
src/mesa/drivers/dri/intel/intel_tex_image.c
Eric Anholt [Wed, 8 Jul 2009 02:33:55 +0000 (19:33 -0700)]
i965: Annotate _NEW_COLOR dependency for brw_update_renderbuffer_surface().
Eric Anholt [Thu, 9 Jul 2009 16:32:21 +0000 (09:32 -0700)]
intel: Keep track of x,y offsets in miptrees and use them for blitting.
By just using offsets, we confused the hardware's tiling calculations,
resulting in failures in miptree validation and blit clears.
Fixes piglit fbo-clearmipmap.
Bug #23552. (automatic mipmap generation)
Brian Paul [Fri, 23 Oct 2009 20:52:10 +0000 (14:52 -0600)]
progs/tests: print requested/internal format info