Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'mesa_7_5_branch' | Brian Paul | 2009-07-17 | 1 | -7/+1 |
|\ | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile progs/glsl/multitex.c src/mesa/main/enums.c src/mesa/main/state.c src/mesa/main/texenvprogram.c src/mesa/main/version.h | ||||
| * | mesa: fix texture border color code for glPopAttrib() | Brian Paul | 2009-07-14 | 1 | -7/+1 |
| | | | | | | | | | | The texture object's border color used to be stored as GLchan but it's been GLfloat for a while now. | ||||
| * | mesa: fix some potential state-restore issues in pop_texture_group() | Brian Paul | 2009-06-22 | 1 | -45/+45 |
| | | | | | | | | | | | | | | Call the _mesa_set_enable() functions instead of driver functions, etc. Also, add missing code for 1D/2D texture arrays. (cherry picked from commit aac19609bfd7c950b2577489b06886c8a8097bb2) | ||||
* | | mesa: use Elements() for loop limit | Brian Paul | 2009-05-22 | 1 | -2/+2 |
| | | |||||
* | | mesa: simplify adjust_buffer_object_ref_counts() | Brian Paul | 2009-05-22 | 1 | -12/+14 |
| | | |||||
* | | 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: fix bad mask bit in clip plane restore code for glPopAttrib() | Lars Henning Wendt | 2009-04-16 | 1 | -1/+1 |
| | |||||
* | mesa: rename some gl_light fields to be clearer | Brian Paul | 2009-04-03 | 1 | -1/+1 |
| | | | | | EyeDirection -> SpotDirection _NormDirection -> _NormSpotDirection | ||||
* | mesa: move glViewport and glDepthRange functions into new viewport.c file | Brian Paul | 2009-03-07 | 1 | -0/+1 |
| | | | | A bit of refactoring with an eye toward ES2 and GL 3.1 | ||||
* | mesa: move gl_attrib_node struct to attrib.c too | Brian Paul | 2009-02-28 | 1 | -0/+12 |
| | |||||
* | mesa: move gl_enable_attrib struct to attrib.c, the only place it's used | Brian Paul | 2009-02-28 | 1 | -0/+84 |
| | |||||
* | mesa: use an array for current texture objects | Brian Paul | 2009-02-21 | 1 | -29/+9 |
| | | | | Use loops to consolidate lots of texture object code. | ||||
* | mesa: re-org texgen state | Brian Paul | 2009-02-21 | 1 | -16/+16 |
| | | | | New gl_texgen struct allows quite a bit of code reduction. | ||||
* | mesa: don't include m_xform.h where not needed | Brian Paul | 2009-02-12 | 1 | -1/+1 |
| | |||||
* | mesa: remove incorrect refcounting adjustment in ↵ | Brian Paul | 2009-01-30 | 1 | -3/+0 |
| | | | | | | | adjust_buffer_object_ref_counts() Fixes bug 19835. However, a more elaborate fix should be implemented someday which uses proper reference counting for gl_array_object. | ||||
* | Make GL_ARB_draw_buffers mandatory | Ian Romanick | 2009-01-28 | 1 | -8/+7 |
| | | | | Signed-off-by: Ian Romanick <[email protected]> | ||||
* | Make GL_ARB_texture_compression mandatory | Ian Romanick | 2009-01-28 | 1 | -3/+2 |
| | | | | Signed-off-by: Ian Romanick <[email protected]> | ||||
* | mesa: remove GL_SGIX_shadow, GL_SGIX_shadow_ambient and GL_SGIX_depth_texture | Brian Paul | 2009-01-28 | 1 | -9/+3 |
| | | | | Everyone should be using the newer/better ARB versions of these extensions. | ||||
* | mesa: increase max texture image units and GLSL samplers to 16 | Brian Paul | 2008-12-31 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | The max texture coord units is still 8. All the fixed-function paths are still limited to 8 too. But GLSL shaders can use more samplers now. Note that some texcoord-related data structures are declared to be 16 elements in size rather than 8. This just simplifies the code in a few places; the extra elements aren't accessible to the user. These changes haven't been extensively tested yet, but sanity checking has been done. It should be possible to increase the max image units/samplers to 32 without doing anything special. Beyond that we'll need longer bitfields in a few places. | ||||
* | mesa: refactor: move glTexParameter-related functions into new texparam.c file | Brian Paul | 2008-09-21 | 1 | -0/+1 |
| | |||||
* | mesa: refactor: move glTexEnv-related functions into new texenv.c file | Brian Paul | 2008-09-21 | 1 | -0/+1 |
| | | | | (cherry picked from commit 7ecac78ab53016ae3db3dd601b187cb050037463) | ||||
* | mesa: refactor: move glTexGen-related functions into new texgen.c file | Brian Paul | 2008-09-21 | 1 | -0/+1 |
| | | | | (cherry picked from commit 27049189d6221fefe43eb55846efaa51742dcdf4) | ||||
* | mesa: refactor: move multisample-related functions into new multisample.c file | Brian Paul | 2008-09-21 | 1 | -0/+1 |
| | |||||
* | mesa: refactor: move _mesa_resizebuffers(), _mesa_ResizeBuffersMESA() to ↵ | Brian Paul | 2008-09-21 | 1 | -0/+1 |
| | | | | | | framebuffer.c (cherry picked from commit 9091015a9782ad15e58540a8fd61df83ea2bfe31) | ||||
* | mesa: refactor: move scissor functions into new scissor.c file | Brian Paul | 2008-09-21 | 1 | -0/+1 |
| | | | | (cherry picked from commit 4be7296bfcba22a849f949d105ea385e6964cc25) | ||||
* | mesa: remove EXT/NV suffixes from _mesa_PointParameter functions | Brian Paul | 2008-09-21 | 1 | -12/+12 |
| | |||||
* | mesa: replace MALLOC w/ CALLOC to fix memory error in glPushClientAttrib() | Brian Paul | 2008-09-05 | 1 | -1/+1 |
| | |||||
* | mesa: improved gl_buffer_object reference counting | Brian Paul | 2008-09-04 | 1 | -36/+51 |
| | | | | | Use new _mesa_reference_buffer_object() function wherever possible. Fixes buffer object/display list crash reported in ParaView. | ||||
* | include varray.h to silence warning | Brian | 2008-03-21 | 1 | -1/+1 |
| | |||||
* | mesa: avoid to unlock an unlocked array in _mesa_PopClientAttrib | Xiang, Haihao | 2008-03-17 | 1 | -1/+1 |
| | |||||
* | Allow first != 0 in mesa CVA handling, and add more error checking. | Eric Anholt | 2008-02-04 | 1 | -2/+4 |
| | |||||
* | Only set R_MODE with NV_point_sprite | Alan Hourihane | 2007-10-28 | 1 | -1/+2 |
| | |||||
* | replace separate 1D/2D/etc fields with an array indexed by texture target | Brian | 2007-08-16 | 1 | -82/+46 |
| | |||||
* | Bring over the texobj refcounting changes from mesa_7_0_branch | Brian | 2007-08-16 | 1 | -77/+159 |
| | |||||
* | Implement mutex/locking around texture object reference counting. | Brian | 2007-08-13 | 1 | -0/+1 |
| | | | | | | Use new _mesa_reference_texobj() function for referencing/unreferencing textures. Add new assertions/tests to try to detect invalid usage of deleted textures. | ||||
* | fix mesa's handling of fbo's / window fb (again) | Roland Scheidegger | 2007-07-19 | 1 | -0/+4 |
| | | | | | | | | Make sure the relevant fields in window fbs get updated at appropriate time (those are NOT the same as fbos!!!), and fix up related code accordingly. This is a bit ugly, but there's a reason the issues section in EXT_fbo is a couple hundred pages long... Hopefully correct now. | ||||
* | restore GL_TEXTURE_LOD_BIAS in _mesa_PopAttrib(), bug 11049 | Brian | 2007-05-23 | 1 | -0/+1 |
| | |||||
* | incr/decr 1D/2DArray texture refcounts like other targets | Brian | 2007-05-23 | 1 | -1/+5 |
| | |||||
* | need to copy new 1D/2D array texture objects in _mesa_PushAttrib() | Brian | 2007-05-19 | 1 | -0/+4 |
| | |||||
* | Initial implementation of MESA_texture_array | Ian Romanick | 2007-05-16 | 1 | -0/+12 |
| | | | | | Shadow sampling from texture arrays is still not implemented. Everything else should be there, though. | ||||
* | don't set GL_TEXTURE_MAX_LEVEL for GL_TEXTURE_RECTANGLE_ARB as that ↵ | Brian | 2007-04-17 | 1 | -1/+2 |
| | | | | generates an error | ||||
* | Colortable re-org. | Brian | 2007-03-16 | 1 | -9/+10 |
| | | | | | The pixel transfer path has three color table lookups. Use an array [3] to store that info, rather than separate variables. | ||||
* | Fix glPush/PopClientAttrib() for VBO state (bug 9445). | Brian | 2007-01-05 | 1 | -2/+15 |
| | |||||
* | fix glPopAttrib/color material bug #9091 | Brian Paul | 2006-11-20 | 1 | -4/+4 |
| | |||||
* | Merge texmem-0-3-branch. | Keith Whitwell | 2006-11-01 | 1 | -0/+5 |
| | |||||
* | fix bug when pushing ReadBuffer state for GL_PIXEL_MODE_BIT | Brian Paul | 2006-08-04 | 1 | -0/+2 |
| | |||||
* | include arrayobj.h | Brian Paul | 2006-06-12 | 1 | -0/+1 |
| | |||||
* | Add support for GL_APPLE_vertex_array_object. Several test programs | Ian Romanick | 2006-06-12 | 1 | -13/+39 |
| | | | | | | | and demos are also added. Adding basic support to drivers should be as easy as just enabling the extension, though thorough test would also be required. | ||||
* | Fix yet another issue with popping GL_DRAW_BUFFER state with respect to | Brian Paul | 2006-04-22 | 1 | -12/+29 |
| | | | | single vs. multiple outputs and what kind of FBO is currently bound. | ||||
* | When popping GL_DRAW_BUFFER state, need to re-do error checking since | Brian Paul | 2006-04-14 | 1 | -4/+15 |
| | | | | | | validity depends on whether a window-system FBO or user-created FBO is currently bound. glPopAttrib() may generate GL_INVALID_OPERATION because of this. |