Commit graph

23880 commits

Author SHA1 Message Date
Alex Deucher
930b42693e R6xx: select proper shader format 2009-05-26 11:36:55 -04:00
Alex Deucher
17417fc8ee fix segfault when running glxinfo 2009-05-26 11:13:44 -04:00
Alex Deucher
4a28974cf5 add missing RS780 pci id 2009-05-26 10:44:44 -04:00
Alex Deucher
ced2f1b94c fix build when HAVE_LIBDRM_RADEON is defined 2009-05-26 10:33:23 -04:00
Jerome Glisse
9dee2f20a2 radeon: on update drawable don't firevertices as it might be call from GetLock
To avoid locking bug we shouldn't not call firevertices from this path
as it's call from radeon get lock.
2009-05-25 16:05:45 +02:00
Jerome Glisse
714f5e689f r200: emit scissor when dri2 is enabled
In DRI1 kernel emit scissor but in dri2 cs path we have to
explicitly program them.
2009-05-25 15:47:39 +02:00
Jerome Glisse
39ef33708c r200: fix multitexturing in dri2 path 2009-05-25 13:17:22 +02:00
Jerome Glisse
80f1ac87f2 r200: emit cliprect with indexed primitive 2009-05-25 11:29:32 +02:00
Jerome Glisse
9b1efcb87c radeon: realloc dma if needed after revalidate
Revalidate can trigger flushing and dma buffer deallocation,
so retry allocation on such case.
2009-05-24 16:24:53 +02:00
Nicolai Hähnle
7dd184dc4d radeon: Remove drawable & readable from radeon_dri_mirror
The duplication of state data caused a crash due to double-free on destruction
of context, because a variable wasn't correctly null'ed out.

Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com>
2009-05-24 15:41:53 +02:00
Brian Paul
2d30dafadd mesa: fix warning message in vbo_exec_DrawRangeElements() 2009-05-22 15:49:38 -06:00
Jerome Glisse
434f920042 radeon: reading back to scratch reg through status map doesn't work
For some unknown reasons the scratch reg value doesn't endup in the status
map at the scratch reg offset, this is a temporary work around until we
figure out why it doesn't work.
2009-05-22 23:44:44 +02:00
Brian Paul
68d412f31c mesa: add missing update_min() call in update_arrays() 2009-05-22 15:35:49 -06:00
Brian Paul
2ead49f98b mesa: reduce gl_array_object::VertexAttrib[] array from 32 to 16 elements
This array was mistakenly dimensioned with VERT_ATTRIB_MAX (32) but it
should really be MAX_VERTEX_GENERIC_ATTRIBS (16).

The generic vertex attributes are in addition to the conventional arrays
(except in NV vertex program mode- they alias/overlay in that case) so
the total of all conventional attributes plus generic attributes should
total 32 (not 48).
2009-05-22 14:57:51 -06:00
Brian Paul
8e3f6c0f96 mesa: use Elements() for loop limit 2009-05-22 14:42:26 -06:00
Brian Paul
842b4cd3cd mesa: use Elements() for loop limit 2009-05-22 14:32:45 -06:00
Brian Paul
ce7a049191 mesa: use Elements() for loop limit 2009-05-22 14:32:37 -06:00
Brian Paul
8091aa8633 mesa: use Elements() for loop limit 2009-05-22 14:28:24 -06:00
Brian Paul
2a3d118a8e mesa: use Elements() for loop limit 2009-05-22 14:27:42 -06:00
Brian Paul
180df4d328 mesa: simplify adjust_buffer_object_ref_counts() 2009-05-22 14:27:26 -06:00
Brian Paul
bf4dfd6563 mesa: minor code clean-up 2009-05-22 14:24:21 -06:00
Brian Paul
d30163ad42 mesa: use Elements() for loop limit 2009-05-22 14:23:02 -06:00
Brian Paul
b625fbaef2 vbo: s/32/VERT_ATTRIB_MAX/ 2009-05-22 14:22:40 -06:00
Brian Paul
ebb991ca0d mesa: use Elements() for loop bound 2009-05-22 14:16:00 -06:00
Brian Paul
a65f385b8d mesa: minor code simplification 2009-05-22 14:14:53 -06:00
Brian Paul
fac334e6d3 Merge branch 'mesa_7_5_branch' 2009-05-22 14:09:35 -06:00
Brian Paul
1045481dd9 mesa: fix loop over generic attribs in update_arrays() 2009-05-22 13:50:31 -06:00
Brian Paul
4b55e36952 vbo: asst. reformatting, clean-ups 2009-05-22 13:44:59 -06:00
Brian Paul
9be72f54ac Merge branch 'mesa_7_5_branch' 2009-05-22 13:21:23 -06:00
Brian Paul
c3538969e1 vbo: fix crash in vbo_exec_bind_arrays()
When a vertex shader uses generic vertex attribute 0, but not gl_Vertex,
we need to set attribute[16] to point to attribute[0].  We were setting the
attribute size, but not the pointer.

Fixes crash in glsl/multitex.c when using the VertCoord attribute instead
of gl_Vertex.
2009-05-22 13:15:41 -06:00
Brian Paul
891a2bdd7d demos: extend glsl/multitex.c to use a vertex buffer object 2009-05-22 13:12:28 -06:00
Brian Paul
96370113f1 demos/util: add funcs for GL_ARB_buffer_object 2009-05-22 13:12:01 -06:00
Brian Paul
58fadc6242 demos: fix multitex.c VertCoord attribute mapping
If the multitex.vert shader uses the VertCoord generic vertex attribute
instead of the pre-defined gl_Vertex attribute, we need to make sure that
VertCoord gets bound to generic vertex attribute zero.

That's because we need to call glVertexAttrib2fv(0, xy) after all the other
vertex attributes have been set since setting generic attribute 0 triggers
vertex submission.  Before, we wound up issuing the vertex attributes in
the order 0, 1, 2 which caused the first vertex to be submitted before all
the attributes were set.  Now, the attributes are set in 1, 2, 0 order.
2009-05-22 13:00:49 -06:00
Brian Paul
1b3f5df1e0 Merge branch 'mesa_7_5_branch' 2009-05-22 09:40:50 -06:00
Brian Paul
995456f930 mesa: allow GL_BITMAP type in _mesa_image_image_stride()
It's possible to hand a GL_COLOR_INDEX/GL_BITMAP image to glTexImage3D()
which gets converted to RGBA via the glPixelMap tables.

This fixes a failure with piglit/fdo10370 with Gallium.
2009-05-22 09:35:02 -06:00
Brian Paul
a545f1ab6d mesa: added some assertions 2009-05-22 07:51:35 -06:00
Brian Paul
42ae2a8648 mesa: use Elements() macro to limit loops instead of constants 2009-05-22 07:51:13 -06:00
Brian Paul
882cd6c839 mesa: remove MAX_VERTEX_PROGRAM_ATTRIBS
Use MAX_VERTEX_GENERIC_ATTRIBS instead.  No need for two #defines for
the same quantity.
2009-05-22 07:30:05 -06:00
Brian Paul
4a95185c9f mesa: rename MAX_VERTEX_ATTRIBS to MAX_VERTEX_GENERIC_ATTRIBS
Be clearer that this is the number of generic vertex program/shader
attributes, not counting the legacy attributes (pos, normal, color, etc).
2009-05-22 07:26:08 -06:00
Brian Paul
4dc426c016 mesa: s/MAX_VERTEX_PROGRAM_ATTRIBS/MAX_NV_VERTEX_PROGRAM_INPUTS/ in NV funcs 2009-05-22 07:19:27 -06:00
Brian Paul
42b747e57d mesa: added comment 2009-05-22 07:14:16 -06:00
Brian Paul
70c4b81e88 mesa: add missing glGet*() case for GL_VERTEX_ARRAY_BINDING_APPLE 2009-05-21 21:49:57 -06:00
Brian Paul
8b91778f46 vbo: fix build breakage...oops 2009-05-21 17:07:33 -06:00
Brian Paul
3bfe312d01 vbo: comments, whitespace clean-ups 2009-05-21 17:03:52 -06:00
Brian Paul
d2a74d76c9 mesa: s/MAX_VERTEX_PROGRAM_ATTRIBS/MAX_NV_VERTEX_PROGRAM_INPUTS 2009-05-21 17:03:21 -06:00
Brian Paul
7e2fb12981 Merge branch 'mesa_7_5_branch' 2009-05-21 16:57:28 -06:00
Brian Paul
8da09e6924 vbo: fix incorrect loop limit in bind_array_obj()
The generic_array[] is 16 elements in size, but the loop was doing 32
iterations.  The out of bounds array write was clobbering the following
inputs[] array but as luck would have it, that didn't matter.
2009-05-21 16:54:35 -06:00
Brian Paul
d4fb7615b5 mesa: use MAX_ values instead of literals 2009-05-21 16:52:45 -06:00
Brian Paul
54a5ffbfa1 mesa: freshen comments for update_array() 2009-05-21 16:10:45 -06:00
Brian Paul
667a4037fa mesa: minor code simplification in _mesa_GetVertexAttrib*NV() 2009-05-21 16:10:45 -06:00