summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/attrib.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'mesa_7_7_branch'Brian Paul2010-01-221-1/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/draw/draw_context.c src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline.c src/gallium/auxiliary/pipebuffer/Makefile src/gallium/auxiliary/pipebuffer/SConscript src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c src/gallium/auxiliary/tgsi/tgsi_scan.c src/gallium/drivers/i915/i915_surface.c src/gallium/drivers/i915/i915_texture.c src/gallium/drivers/llvmpipe/lp_setup.c src/gallium/drivers/llvmpipe/lp_tex_sample_c.c src/gallium/drivers/llvmpipe/lp_texture.c src/gallium/drivers/softpipe/sp_prim_vbuf.c src/gallium/state_trackers/xorg/xorg_dri2.c src/gallium/winsys/drm/intel/gem/intel_drm_api.c src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c src/gallium/winsys/drm/radeon/core/radeon_drm.c src/gallium/winsys/drm/vmware/core/vmw_screen_dri.c src/mesa/state_tracker/st_cb_clear.c
| * mesa: Remove unnecessary header from attrib.c.Vinson Lee2010-01-181-1/+0
| |
* | mesa: make texture BorderColor a union of float/int/uintBrian Paul2010-01-041-1/+1
| | | | | | | | | | | | | | | | When we have integer-valued texture formats, the texture border color must also store integer and uint values. With GL 3.0, the new glTexParameterIiv() and glTexParameterIuiv() functions can set the border color to int or uint values.
* | Merge branch 'mesa_7_7_branch'Brian Paul2010-01-041-15/+32
|\| | | | | | | | | | | | | | | | | Conflicts: docs/relnotes.html src/gallium/drivers/llvmpipe/lp_tex_sample_c.c src/gallium/drivers/r300/r300_cs.h src/mesa/drivers/dri/i965/brw_wm_surface_state.c src/mesa/main/enums.c
| * mesa: Prevent possible array out-of-bounds access by _mesa_light.Vinson Lee2010-01-041-15/+32
| |
* | mesa: fix-up blend enable/disable code in _mesa_PopAttrib()Brian Paul2009-12-291-7/+17
| |
* | mesa: finish-up indexed color mask code in _mesa_PopAttrib()Brian Paul2009-12-291-1/+1
| |
* | mesa: implement per-buffer color maskingBrian Paul2009-12-291-4/+16
| | | | | | | | | | | | | | | | | | | | | | This is part of the GL_EXT_draw_buffers2 extension and part of GL 3.0. The ctx->Color.ColorMask field is now a 2-D array. Until drivers are modified to support per-buffer color masking, they can just look at the 0th color mask. The new _mesa_ColorMaskIndexed() function will be called by glColorMaskIndexedEXT() or glColorMaski().
* | mesa: per-buffer blend enabled flagsBrian Paul2009-12-291-2/+14
|/ | | | | | | | | | | | | | | ctx->Color.BlendEnabled is now a GLbitfield instead of a GLboolean to indicate blend on/off status for each color/draw buffer. This is infrastructure for GL_EXT_draw_buffers2 and OpenGL 3.x New functions include _mesa_EnableIndexed(), _mesa_DisableIndexed(), and _mesa_IsEnabledIndexed(). The enable function corresponds to glEnableIndexedEXT() for GL_EXT_draw_buffers2 or glEnablei() for GL3. Note that there's quite a few tests for ctx->Color.BlendEnabled != 0 in drivers, etc. Those tests can remain as-is since the mask will be 0 or ~0 unless GL_EXT_draw_buffers2 is enabled.
* mesa/main: Make FEATURE_attrib_stack follow feature conventions.Chia-I Wu2009-09-301-0/+17
| | | | | As shown in mfeatures.h, this allows users of attrib.h to work without knowing if the feature is available.
* mesa: Add support for ARB_depth_clamp.Eric Anholt2009-09-081-0/+7
| | | | | This currently doesn't include fixing up the cliptests in the assembly paths to support ARB_depth_clamp, so enabling depth_clamp forces the C path.
* mesa: simplify glPushAttrib() list building codeBrian Paul2009-08-081-106/+40
|
* Merge branch 'mesa_7_5_branch'Brian Paul2009-07-171-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 Paul2009-07-141-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 Paul2009-06-221-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 limitBrian Paul2009-05-221-2/+2
| |
* | mesa: simplify adjust_buffer_object_ref_counts()Brian Paul2009-05-221-12/+14
| |
* | mesa: fix some potential state-restore issues in pop_texture_group()Brian Paul2009-05-211-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 Wendt2009-04-161-1/+1
|
* mesa: rename some gl_light fields to be clearerBrian Paul2009-04-031-1/+1
| | | | | EyeDirection -> SpotDirection _NormDirection -> _NormSpotDirection
* mesa: move glViewport and glDepthRange functions into new viewport.c fileBrian Paul2009-03-071-0/+1
| | | | A bit of refactoring with an eye toward ES2 and GL 3.1
* mesa: move gl_attrib_node struct to attrib.c tooBrian Paul2009-02-281-0/+12
|
* mesa: move gl_enable_attrib struct to attrib.c, the only place it's usedBrian Paul2009-02-281-0/+84
|
* mesa: use an array for current texture objectsBrian Paul2009-02-211-29/+9
| | | | Use loops to consolidate lots of texture object code.
* mesa: re-org texgen stateBrian Paul2009-02-211-16/+16
| | | | New gl_texgen struct allows quite a bit of code reduction.
* mesa: don't include m_xform.h where not neededBrian Paul2009-02-121-1/+1
|
* mesa: remove incorrect refcounting adjustment in ↵Brian Paul2009-01-301-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 mandatoryIan Romanick2009-01-281-8/+7
| | | | Signed-off-by: Ian Romanick <[email protected]>
* Make GL_ARB_texture_compression mandatoryIan Romanick2009-01-281-3/+2
| | | | Signed-off-by: Ian Romanick <[email protected]>
* mesa: remove GL_SGIX_shadow, GL_SGIX_shadow_ambient and GL_SGIX_depth_textureBrian Paul2009-01-281-9/+3
| | | | Everyone should be using the newer/better ARB versions of these extensions.
* mesa: increase max texture image units and GLSL samplers to 16Brian Paul2008-12-311-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 fileBrian Paul2008-09-211-0/+1
|
* mesa: refactor: move glTexEnv-related functions into new texenv.c fileBrian Paul2008-09-211-0/+1
| | | | (cherry picked from commit 7ecac78ab53016ae3db3dd601b187cb050037463)
* mesa: refactor: move glTexGen-related functions into new texgen.c fileBrian Paul2008-09-211-0/+1
| | | | (cherry picked from commit 27049189d6221fefe43eb55846efaa51742dcdf4)
* mesa: refactor: move multisample-related functions into new multisample.c fileBrian Paul2008-09-211-0/+1
|
* mesa: refactor: move _mesa_resizebuffers(), _mesa_ResizeBuffersMESA() to ↵Brian Paul2008-09-211-0/+1
| | | | | | framebuffer.c (cherry picked from commit 9091015a9782ad15e58540a8fd61df83ea2bfe31)
* mesa: refactor: move scissor functions into new scissor.c fileBrian Paul2008-09-211-0/+1
| | | | (cherry picked from commit 4be7296bfcba22a849f949d105ea385e6964cc25)
* mesa: remove EXT/NV suffixes from _mesa_PointParameter functionsBrian Paul2008-09-211-12/+12
|
* mesa: replace MALLOC w/ CALLOC to fix memory error in glPushClientAttrib()Brian Paul2008-09-051-1/+1
|
* mesa: improved gl_buffer_object reference countingBrian Paul2008-09-041-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 warningBrian2008-03-211-1/+1
|
* mesa: avoid to unlock an unlocked array in _mesa_PopClientAttribXiang, Haihao2008-03-171-1/+1
|
* Allow first != 0 in mesa CVA handling, and add more error checking.Eric Anholt2008-02-041-2/+4
|
* Only set R_MODE with NV_point_spriteAlan Hourihane2007-10-281-1/+2
|
* replace separate 1D/2D/etc fields with an array indexed by texture targetBrian2007-08-161-82/+46
|
* Bring over the texobj refcounting changes from mesa_7_0_branchBrian2007-08-161-77/+159
|
* Implement mutex/locking around texture object reference counting.Brian2007-08-131-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 Scheidegger2007-07-191-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 11049Brian2007-05-231-0/+1
|
* incr/decr 1D/2DArray texture refcounts like other targetsBrian2007-05-231-1/+5
|