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
8e3f6c0f96
mesa: use Elements() for loop limit
2009-05-22 14:42:26 -06:00
842b4cd3cd
mesa: use Elements() for loop limit
2009-05-22 14:32:45 -06:00
ce7a049191
mesa: use Elements() for loop limit
2009-05-22 14:32:37 -06:00
8091aa8633
mesa: use Elements() for loop limit
2009-05-22 14:28:24 -06:00
2a3d118a8e
mesa: use Elements() for loop limit
2009-05-22 14:27:42 -06:00
180df4d328
mesa: simplify adjust_buffer_object_ref_counts()
2009-05-22 14:27:26 -06:00
bf4dfd6563
mesa: minor code clean-up
2009-05-22 14:24:21 -06:00
d30163ad42
mesa: use Elements() for loop limit
2009-05-22 14:23:02 -06:00
b625fbaef2
vbo: s/32/VERT_ATTRIB_MAX/
2009-05-22 14:22:40 -06:00
ebb991ca0d
mesa: use Elements() for loop bound
2009-05-22 14:16:00 -06:00
a65f385b8d
mesa: minor code simplification
2009-05-22 14:14:53 -06:00
fac334e6d3
Merge branch 'mesa_7_5_branch'
2009-05-22 14:09:35 -06:00
1045481dd9
mesa: fix loop over generic attribs in update_arrays()
2009-05-22 13:50:31 -06:00
4b55e36952
vbo: asst. reformatting, clean-ups
2009-05-22 13:44:59 -06:00
9be72f54ac
Merge branch 'mesa_7_5_branch'
2009-05-22 13:21:23 -06:00
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
1b3f5df1e0
Merge branch 'mesa_7_5_branch'
2009-05-22 09:40:50 -06:00
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
a545f1ab6d
mesa: added some assertions
2009-05-22 07:51:35 -06:00
42ae2a8648
mesa: use Elements() macro to limit loops instead of constants
2009-05-22 07:51:13 -06:00
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
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
4dc426c016
mesa: s/MAX_VERTEX_PROGRAM_ATTRIBS/MAX_NV_VERTEX_PROGRAM_INPUTS/ in NV funcs
2009-05-22 07:19:27 -06:00
42b747e57d
mesa: added comment
2009-05-22 07:14:16 -06:00
70c4b81e88
mesa: add missing glGet*() case for GL_VERTEX_ARRAY_BINDING_APPLE
2009-05-21 21:49:57 -06:00
8b91778f46
vbo: fix build breakage...oops
2009-05-21 17:07:33 -06:00
3bfe312d01
vbo: comments, whitespace clean-ups
2009-05-21 17:03:52 -06:00
d2a74d76c9
mesa: s/MAX_VERTEX_PROGRAM_ATTRIBS/MAX_NV_VERTEX_PROGRAM_INPUTS
2009-05-21 17:03:21 -06:00
7e2fb12981
Merge branch 'mesa_7_5_branch'
2009-05-21 16:57:28 -06:00
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
d4fb7615b5
mesa: use MAX_ values instead of literals
2009-05-21 16:52:45 -06:00
54a5ffbfa1
mesa: freshen comments for update_array()
2009-05-21 16:10:45 -06:00
667a4037fa
mesa: minor code simplification in _mesa_GetVertexAttrib*NV()
2009-05-21 16:10:45 -06:00
024de60348
mesa: comment for _mesa_GetVertexAttribfvARB()
2009-05-21 16:10:45 -06:00
254845fad0
mesa: minor code simplification in _mesa_GetVertexAttribfvARB()
2009-05-21 16:10:45 -06:00
6a2211f000
mesa: remove const qualifier
2009-05-21 16:10:45 -06:00
a554d7c4d8
mesa: VertexAttribPointer comments
2009-05-21 16:10:45 -06:00
8fe3134622
mesa: call _mesa_update_array_object_max_element() before printing array info
2009-05-21 16:10:45 -06:00
8fa0cb2b42
mesa: added gl_array_object::Weight array field
...
We don't really implement vertex weights but in the VBO code this
fixes and odd case for the legacy_array[] setup. Before, the
vbo->draw_prims() call was always indicating that the vertex weight
array was present/enabled when it really wasn't.
2009-05-21 16:10:45 -06:00
1889890c88
mesa: check FEATURE_point_size_array for PointSize array
2009-05-21 16:10:45 -06:00
aac19609bf
mesa: fix some potential state-restore issues in pop_texture_group()
...
Call the _mesa_set_enable() functions instead of driver functions, etc.
Also, add missing code for 1D/2D texture arrays.
2009-05-21 16:10:45 -06:00
de1cfc5e8a
mesa: new _mesa_update_array_object_max_element() function
...
This will replace the code in state.c
2009-05-21 16:10:45 -06:00
dda82137d2
vbo: return VP_NONE from get_program_mode() if running fixed-func vertex program
...
If we're running a vertex program to emulated fixed-function, we still need
to treat vertex arrays/attributes as if we're in fixed-function mode.
This should probably be back-ported to Mesa 7.5 after a bit more testing.
2009-05-21 16:10:45 -06:00
a1f6f82e82
vbo: move vp_mode enum to vbo_exec.h, use enum instead of GLuint
2009-05-21 16:10:45 -06:00
bd0861e274
i965: fix whitespace in brw_tex_layout.c
...
The broken indentation was driving me crazy, so fix other stuff while
I'm here.
2009-05-21 10:41:49 -07:00
3a521d84ec
i956: Make state dependency of SF on drawbuffer bounds match Mesa's.
...
Noticed while debugging a weird 1D FBO testcase that left its existing
viewport and projection matrix in place when switching drawbuffers. Didn't
fix the testcase, though.
2009-05-21 10:41:39 -07:00
e78a6aa2b9
intel: Fall back on any rendering to texture with no miptree.
...
Fixes segfault on an fbo.c negative test for FBO with texture width/height
of 0. Previously we just tested for border != 0 to work around this
segfault.
2009-05-21 10:40:11 -07:00
8bba183b9e
intel: Mark the FBO as incomplete if there's no intel_renderbuffer for it.
...
This happens to rendering with textures with a border, which had resulted
in a segfault on dereferencing the irb.
2009-05-21 10:40:11 -07:00
467f18f7a5
intel: Don't segfault on glGenerateMipmaps of a cube map with one face defined.
...
This presumably applies to SGIS_generate_mipmaps as well.
2009-05-21 10:40:11 -07:00
Brian Paul