Brian Paul
1596f714d2
intel: remove debug code
2009-10-29 10:56:13 -06:00
Brian Paul
2b628d43c0
mesa: consolidate some code in _mesa_GetCompressedTexImageARB()
2009-10-29 10:53:26 -06:00
Brian Paul
dcb4716802
intel: added fast memcpy path for glGetTexImage()
2009-10-29 10:50:26 -06:00
Brian Paul
1e2c517026
progs/tests: also test GL_BGRA format in getteximage.c
2009-10-29 10:50:26 -06:00
Brian Paul
01ee5c63d3
mesa: move pixels==NULL check in glGetTexImage()
2009-10-29 10:50:26 -06:00
Brian Paul
99bbf4b4f5
mesa: consolidate some code in _mesa_GetTexImage()
2009-10-29 10:50:26 -06:00
Brian Paul
67df4fb56b
mesa: move, clean-up _mesa_print_texture()
2009-10-29 10:50:26 -06:00
Brian Paul
d580c0c8f7
mesa: fix some tests in subtexture_error_check2()
...
Don't use hard-coded compressed block sizes.
Update comments and error strings.
2009-10-29 10:50:26 -06:00
Brian Paul
cf7040594e
mesa: remove unneedded is_srgb_teximage() function
...
Use _mesa_get_format_color_encoding() function instead.
2009-10-29 10:50:26 -06:00
Brian Paul
c89f5b6ac8
glsl: make shader substitution a little better
2009-10-29 10:50:26 -06:00
David Heidelberger
41892e9b17
st/mesa: fix PIPE_FORMAT_X8Z24 <> MESA_FORMAT_X8_Z24 conversion
...
Signed-off-by: David Heidelberger <d.okias@gmail.com>
Signed-off-by: Brian Paul <brianp@vmware.com>
2009-10-29 10:14:41 -06:00
David Heidelberger
10a509564f
st/mesa: Add conversion from PIPE_FORMAT_X8Z24_UNORM to MESA_FORMAT_S8_Z24.
...
Fix glxgears and openarena for Nouveau (no more asserts and crash).
Signed-off-by: David Heidelberger <d.okias@gmail.com
Signed-off-by: Brian Paul <brianp@vmware.com>
2009-10-29 09:56:14 -06:00
David Heidelberger
c2f5eb7148
st/mesa: Fix nouveau glxinfo after merging texformat-rework.
...
Signed-off-by: David Heidelberger <d.okias@gmail.com>
Signed-off-by: Brian Paul <brianp@vmware.com>
2009-10-29 09:54:38 -06:00
Brian Paul
1f1bfe8cb5
mesa: move declaration to prevent unused var warning
2009-10-29 07:54:44 -06:00
Chia-I Wu
9927d7f31c
mesa: Fix compilation errors and warnings when features are disabled.
...
Some of the fixes are cherry-picked from opengl-es branch.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2009-10-29 07:52:58 -06:00
Chia-I Wu
59798cd886
mesa/main: Make FEATURE_texture_s3tc follow feature conventions.
...
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2009-10-29 07:52:58 -06:00
Chia-I Wu
20e20fc5af
mesa/main: Make FEATURE_texture_fxt1 follow feature conventions.
...
Also remove the unused initialization and GLchan fetch functions.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2009-10-29 07:52:58 -06:00
Chia-I Wu
920f023e8b
mesa/main: Never return NULL in _mesa_get_texstore_func.
...
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2009-10-29 07:52:58 -06:00
Brian Paul
e2131e0171
radeon: fix incorrect Z format in radeon_alloc_renderbuffer_storage()
...
And update error message.
2009-10-29 07:47:41 -06:00
Cooper Yuan
da1fb3be82
r300g: Fix bytes_per_line calculation error while displaying surface
2009-10-29 20:20:59 +08:00
Chia-I Wu
59b29516af
swrast: added braces
2009-10-28 22:14:01 -06:00
Brian Paul
c6bd5fae0c
mesa: remove old, unused #define
2009-10-28 21:52:37 -06:00
Brian Paul
635ea87374
progs/tests: added test for GL_EXT_texture_compression_s3tc support
2009-10-28 21:50:51 -06:00
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