Brian Paul
bd36ca9b76
mesa: re-remove s3v and trident driver files
...
These were removed from master but a few files came back from the
texformat-rework branch.
2009-10-28 21:46:37 -06:00
Brian Paul
960d49b387
mesa: move some gl_texture_image and gl_renderbuffer fields around
2009-10-28 21:43:50 -06:00
Brian Paul
bc143b1a9f
mesa: minor code movement
2009-10-28 21:25:56 -06:00
Brian Paul
1f196b786d
Merge branch 'texformat-rework'
...
Conflicts:
src/mesa/drivers/dri/radeon/radeon_fbo.c
src/mesa/drivers/dri/s3v/s3v_tex.c
src/mesa/drivers/dri/s3v/s3v_xmesa.c
src/mesa/drivers/dri/trident/trident_context.c
src/mesa/main/debug.c
src/mesa/main/mipmap.c
src/mesa/main/texformat.c
src/mesa/main/texgetimage.c
2009-10-28 21:24:11 -06:00
Brian Paul
086f9fc0e2
swrast: fix RGB, RGBA texturing code
...
Fix backward component ordering for RGB textures.
Only optimize RGBA texture case if running little endian. This restriction
could be lifted with a little work.
2009-10-28 19:46:28 -06:00
Brian Paul
88bb4b5935
swrast: check for single texture unit in _swrast_choose_triangle()
2009-10-28 19:41:24 -06:00
Brian Paul
0103d7a47a
swrast: clean up and remove dead code in triangle functions
2009-10-28 19:40:56 -06:00
Brian Paul
1e7517f059
swrast: fix texel decoding in opt_sample_rgba_2d()
2009-10-28 19:38:12 -06:00
Brian Paul
7ac233ec15
mesa: choose texture format in _mesa_get_fallback_texture()
2009-10-28 19:33:48 -06:00
Brian Paul
0ea575d721
Merge branch 'mesa_7_6_branch'
2009-10-28 18:27:25 -06:00
Vinson Lee
96128fdf2f
mesa: Fix memory leak if we run out of memory
...
Signed-off-by: Brian Paul <brianp@vmware.com>
2009-10-28 17:59:49 -06:00
Zack Rusin
24c61c8c2e
st/xorg: fix src coordinates in the video acceleration paths
2009-10-28 16:53:50 -04:00
Alex Deucher
660acd60d0
r600: add occlusion query support
...
Based on initial patch from Stephan Schmid <stephan_2303@gmx.de>.
Basic idea is to dump the zpass count at the start and end of the query
and subtract to get the total number of visible fragments. HW writes
alternating qwords for up to 4 DBs. On the first pass, we start at
buffer address + 0; on the second pass, we start at buffer address + 8
(bytes). The resulting buffer at the end of the query looks like:
qw[0]: db0 start
qw[1]: db0 end
...
qw[6]: db3 start
qw[7]: db3 end
The MSB of each qword is the valid bit and the lower 63 bits are
the zpass count for that DB.
OQ on RV740 is disabled at the moment as it only seems to report
results for half of its DBs. This needs further investigation.
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
2009-10-28 15:53:24 -04:00
Corbin Simpson
f3d8d534e6
r300g: Use u_trim_pipe_prim to prevent lockups from incorrect vert counts.
...
Adapted from osiris' version on his tree.
2009-10-28 12:15:35 -07:00
Corbin Simpson
23d8d15bed
r300g: Keep texture formats organized.
2009-10-28 12:15:35 -07:00
Maciej Cencora
e7c8a27638
r300g: add some texture formats
2009-10-28 12:15:35 -07:00
Corbin Simpson
6007e2e008
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.
2009-10-28 12:15:34 -07:00
Corbin Simpson
81c51bb67f
r300g: Fix XXX.
...
Nothing strange here.
2009-10-28 12:15:34 -07:00
Marek Olšák
bcfde42913
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.
2009-10-28 12:15:34 -07:00
Marek Olšák
a1d726aae8
r300g: fix the WRAP_T mode when using 1D textures
...
Signed-off-by: Corbin Simpson <MostAwesomeDude@gmail.com>
2009-10-28 12:15:34 -07:00
Marek Olšák
0e44884aad
r300g: fix blending and do some optimizations
...
Signed-off-by: Corbin Simpson <MostAwesomeDude@gmail.com>
2009-10-28 12:15:34 -07:00
Marek Olšák
c451011d99
mesa/st: fix crash in st_texture_image_copy
...
Signed-off-by: Corbin Simpson <MostAwesomeDude@gmail.com>
2009-10-28 12:15:33 -07:00
Vinson Lee
c0a61c8442
intel: Fix memory leak in case of renderbuffer bad format
...
Signed-off-by: Brian Paul <brianp@vmware.com>
2009-10-28 13:09:44 -06:00
Brian Paul
7d56caabe4
Merge branch 'mesa_7_6_branch'
...
Conflicts:
src/mesa/shader/lex.yy.c
src/mesa/shader/program_lexer.l
2009-10-28 11:33:51 -06:00
Brian Paul
0219cd0961
mesa: remove unneeded #includes
2009-10-28 11:13:21 -06:00
Brian Paul
5e3b2baae7
mesa: include imports.h to silence warning
2009-10-28 11:11:30 -06:00
Vinson Lee
a7d0665c00
intel: Fix memory leak in event of mip tree allocation failure
...
Signed-off-by: Brian Paul <brianp@vmware.com>
2009-10-28 11:10:14 -06:00
José Fonseca
182ff3e47a
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.
2009-10-28 11:26:26 +00:00
José Fonseca
5eba607db6
util: Drop return value from cpuid().
2009-10-28 11:26:26 +00:00
José Fonseca
0426227b68
util: Fix cpuid on MSVC.
2009-10-28 11:26:26 +00:00
José Fonseca
095e66f695
llvmpipe: Implement round() for MSVC.
2009-10-28 11:26:26 +00:00
Brian Paul
6bc1e9fd69
mesa: consolidate _mesa_CompressedTexSubImage[123]DARB() functions
2009-10-27 21:39:44 -06:00
Brian Paul
f3c29bd74f
mesa: consolidate CompressedTexSubImage1/2/3DARB() error checking
2009-10-27 21:15:48 -06:00
Brian Paul
9519603f74
mesa: simplify teximage code with get_current_tex_object()
2009-10-27 21:15:36 -06:00
Brian Paul
dd5691e802
mesa: code refactoring to eliminate a switch stmt in bind_buffer_object()
2009-10-27 20:10:59 -06:00
Brian Paul
b44304efde
glsl: avoid redundant state changes in _mesa_use_program()
2009-10-27 20:10:59 -06:00
Zack Rusin
2947d14202
st/xorg: fix xv
2009-10-27 21:00:47 -04:00
Ian Romanick
93dae6761b
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. :(
2009-10-27 17:06:18 -07:00
Ian Romanick
8df9587d68
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.
2009-10-27 17:06:18 -07:00
Ian Romanick
0f255d1956
ARB prog parser: Don't leak symbol table header structures
2009-10-27 17:06:18 -07:00
Eric Anholt
2643a7ba29
intel: Fix flipped condition in ARB_sync GetSYnciv(GL_SYNC_STATUS).
...
Bug #24435
(cherry picked from commit d56125a298 )
2009-10-27 16:59:03 -07:00
Brian Paul
b7eea8c616
intel: added region draw_x/y offsets in x/y_tile_swizzle() funcs
...
This fixes the second part of bug 23552.
2009-10-27 17:35:30 -06:00
Brian Paul
52374d7e4c
radeon: add case for MESA_FORMAT_X8_Z24 in radeon_create_renderbuffer()
2009-10-27 17:05:08 -06:00
Brian Paul
f8155ef51f
intel: silence warning
2009-10-27 17:01:26 -06:00
Brian Paul
21f8d31cfd
mesa: debug code for glBlitFramebuffer()
2009-10-27 17:00:31 -06:00
Brian Paul
507cf530b9
via: silence unused var warnings
2009-10-27 17:00:31 -06:00
Brian Paul
3c71666921
intel: minor clean-up, comments
2009-10-27 17:00:31 -06:00
Brian Paul
7fd8c6ca2a
intel: use _mesa_get_current_tex_unit() helper
2009-10-27 17:00:31 -06:00
Brian Paul
05ec586851
mesa: s/Bilt/Blit
2009-10-27 17:00:31 -06:00
Brian Paul
403181b913
mesa: more texture debug code changes, improvements
2009-10-27 17:00:31 -06:00