Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | vbo: asst. reformatting, clean-ups | Brian Paul | 2009-05-22 | 1 | -34/+46 |
| | |||||
* | Merge branch 'mesa_7_5_branch' | Brian Paul | 2009-05-22 | 1 | -0/+1 |
|\ | |||||
| * | vbo: fix crash in vbo_exec_bind_arrays() | Brian Paul | 2009-05-22 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | 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. | ||||
* | | Merge branch 'mesa_7_5_branch' | Brian Paul | 2009-05-22 | 3 | -14/+40 |
|\| | |||||
| * | mesa: allow GL_BITMAP type in _mesa_image_image_stride() | Brian Paul | 2009-05-22 | 1 | -13/+23 |
| | | | | | | | | | | | | | | 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. | ||||
| * | mesa: added comment | Brian Paul | 2009-05-22 | 1 | -0/+1 |
| | | |||||
| * | mesa: add missing glGet*() case for GL_VERTEX_ARRAY_BINDING_APPLE | Brian Paul | 2009-05-21 | 2 | -1/+16 |
| | | |||||
* | | mesa: added some assertions | Brian Paul | 2009-05-22 | 2 | -0/+10 |
| | | |||||
* | | mesa: use Elements() macro to limit loops instead of constants | Brian Paul | 2009-05-22 | 1 | -5/+5 |
| | | |||||
* | | mesa: remove MAX_VERTEX_PROGRAM_ATTRIBS | Brian Paul | 2009-05-22 | 5 | -14/+13 |
| | | | | | | | | | | Use MAX_VERTEX_GENERIC_ATTRIBS instead. No need for two #defines for the same quantity. | ||||
* | | mesa: rename MAX_VERTEX_ATTRIBS to MAX_VERTEX_GENERIC_ATTRIBS | Brian Paul | 2009-05-22 | 7 | -40/+40 |
| | | | | | | | | | | Be clearer that this is the number of generic vertex program/shader attributes, not counting the legacy attributes (pos, normal, color, etc). | ||||
* | | mesa: s/MAX_VERTEX_PROGRAM_ATTRIBS/MAX_NV_VERTEX_PROGRAM_INPUTS/ in NV funcs | Brian Paul | 2009-05-22 | 1 | -8/+8 |
| | | |||||
* | | vbo: fix build breakage...oops | Brian Paul | 2009-05-21 | 1 | -1/+1 |
| | | |||||
* | | vbo: comments, whitespace clean-ups | Brian Paul | 2009-05-21 | 1 | -19/+26 |
| | | |||||
* | | mesa: s/MAX_VERTEX_PROGRAM_ATTRIBS/MAX_NV_VERTEX_PROGRAM_INPUTS | Brian Paul | 2009-05-21 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'mesa_7_5_branch' | Brian Paul | 2009-05-21 | 1 | -2/+5 |
|\| | |||||
| * | vbo: fix incorrect loop limit in bind_array_obj() | Brian Paul | 2009-05-21 | 1 | -1/+4 |
| | | | | | | | | | | | | 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. | ||||
| * | mesa: use MAX_ values instead of literals | Brian Paul | 2009-05-21 | 1 | -2/+2 |
| | | |||||
* | | mesa: freshen comments for update_array() | Brian Paul | 2009-05-21 | 1 | -3/+2 |
| | | |||||
* | | mesa: minor code simplification in _mesa_GetVertexAttrib*NV() | Brian Paul | 2009-05-21 | 1 | -10/+19 |
| | | |||||
* | | mesa: comment for _mesa_GetVertexAttribfvARB() | Brian Paul | 2009-05-21 | 1 | -0/+4 |
| | | |||||
* | | mesa: minor code simplification in _mesa_GetVertexAttribfvARB() | Brian Paul | 2009-05-21 | 1 | -6/+9 |
| | | |||||
* | | mesa: remove const qualifier | Brian Paul | 2009-05-21 | 1 | -1/+1 |
| | | |||||
* | | mesa: VertexAttribPointer comments | Brian Paul | 2009-05-21 | 1 | -0/+11 |
| | | |||||
* | | mesa: call _mesa_update_array_object_max_element() before printing array info | Brian Paul | 2009-05-21 | 1 | -0/+2 |
| | | |||||
* | | mesa: added gl_array_object::Weight array field | Brian Paul | 2009-05-21 | 3 | -1/+5 |
| | | | | | | | | | | | | | | 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. | ||||
* | | mesa: check FEATURE_point_size_array for PointSize array | Brian Paul | 2009-05-21 | 1 | -0/+2 |
| | | |||||
* | | mesa: fix some potential state-restore issues in pop_texture_group() | Brian Paul | 2009-05-21 | 1 | -45/+45 |
| | | | | | | | | | | | | Call the _mesa_set_enable() functions instead of driver functions, etc. Also, add missing code for 1D/2D texture arrays. | ||||
* | | mesa: new _mesa_update_array_object_max_element() function | Brian Paul | 2009-05-21 | 2 | -2/+83 |
| | | | | | | | | This will replace the code in state.c | ||||
* | | vbo: return VP_NONE from get_program_mode() if running fixed-func vertex program | Brian Paul | 2009-05-21 | 1 | -0/+2 |
| | | | | | | | | | | | | | | 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. | ||||
* | | vbo: move vp_mode enum to vbo_exec.h, use enum instead of GLuint | Brian Paul | 2009-05-21 | 2 | -8/+14 |
| | | |||||
* | | i965: fix whitespace in brw_tex_layout.c | Eric Anholt | 2009-05-21 | 1 | -32/+31 |
| | | | | | | | | | | The broken indentation was driving me crazy, so fix other stuff while I'm here. | ||||
* | | i956: Make state dependency of SF on drawbuffer bounds match Mesa's. | Eric Anholt | 2009-05-21 | 1 | -2/+5 |
| | | | | | | | | | | | | 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. | ||||
* | | intel: Fall back on any rendering to texture with no miptree. | Eric Anholt | 2009-05-21 | 1 | -4/+4 |
| | | | | | | | | | | | | 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. | ||||
* | | intel: Mark the FBO as incomplete if there's no intel_renderbuffer for it. | Eric Anholt | 2009-05-21 | 1 | -0/+5 |
| | | | | | | | | | | This happens to rendering with textures with a border, which had resulted in a segfault on dereferencing the irb. | ||||
* | | intel: Don't segfault on glGenerateMipmaps of a cube map with one face defined. | Eric Anholt | 2009-05-21 | 1 | -2/+2 |
| | | | | | | | | This presumably applies to SGIS_generate_mipmaps as well. | ||||
* | | intel: Use _mesa_CheckFramebufferStatusEXT insteaad of glCheck... | Eric Anholt | 2009-05-21 | 1 | -1/+1 |
| | | | | | | | | Fixes a segfault in our oglconform fbo test. | ||||
* | | mesa: added debug functions for dumping color/depth/stencil buffers | Brian Paul | 2009-05-21 | 2 | -0/+110 |
| | | |||||
* | | i965: rename var: s/tmp/vs_inputs/ | Brian Paul | 2009-05-21 | 1 | -8/+8 |
| | | |||||
* | | mesa: remove pointless null ptr check, improved some error messages | Brian Paul | 2009-05-21 | 1 | -3/+3 |
| | | |||||
* | | mesa: added _mesa_print_arrays() for debugging | Brian Paul | 2009-05-21 | 2 | -13/+51 |
| | | |||||
* | | mesa: updated comment for _MaxElement field | Brian Paul | 2009-05-21 | 1 | -1/+1 |
| | | | | | | | | It's the largest array index, plus one. | ||||
* | | mesa: move gl_array_attrib::_MaxElement to gl_array_object::_MaxElement | Brian Paul | 2009-05-21 | 4 | -8/+14 |
| | | | | | | | | This value is per array object. | ||||
* | | vbo: s/8/MAX_TEXTURE_COORD_UNITS/ | Brian Paul | 2009-05-21 | 1 | -1/+1 |
| | | |||||
* | | st: add support for GL_EXT_vertex_array_bgra | Brian Paul | 2009-05-21 | 4 | -2/+16 |
| | | |||||
* | | st: reformatting, comments, var renaming | Brian Paul | 2009-05-19 | 1 | -19/+29 |
| | | |||||
* | | Merge branch 'mesa_7_5_branch' | Brian Paul | 2009-05-19 | 2 | -4/+15 |
|\| | |||||
| * | mesa: allow depth/stencil textures to be attached to GL_STENCIL_ATTACHMENT | Mathias Fröhlich | 2009-05-19 | 1 | -4/+14 |
| | | | | | | | | See sourceforge bug #2793846. | ||||
| * | mesa: assign trb->Base.StencilBits in update_wrapper(). | Brian Paul | 2009-05-19 | 1 | -0/+1 |
| | | | | | | | | When we render to a depth/stencil texture there are stencil bits. | ||||
* | | mesa: print more info when valid_texture_object() fails | Brian Paul | 2009-05-19 | 1 | -1/+2 |
| | |