summaryrefslogtreecommitdiff
path: root/src/mesa/main/state.c
AgeCommit message (Collapse)AuthorFilesLines
2010-07-02mesa: make the number of draw buffers part of the texenv program key stateBrian Paul1-1/+1
All the state that effects the program should be in the key. This didn't help with bug 28169 but is a good fix anyway. NOTE: this is a low-priority candidate for the 7.8 branch. In practice, this issue might never be hit.
2010-06-28mesa: initial support for ARB_geometry_shader4Zack Rusin1-1/+29
laying down the foundation for everything and implementing most of the stuff. linking, gl_VerticesIn and multidimensional inputs are left.
2010-06-10mesa: rename src/mesa/shader/ to src/mesa/program/Brian Paul1-2/+2
2010-04-05mesa: update_arrays() depends on program state.Henri Verbeet1-3/+2
It uses ctx->VertexProgram._Current. Signed-off-by: Brian Paul <brianp@vmware.com>
2010-02-19Replace the _mesa_*printf() wrappers with the plain libc versionsKristian Høgsberg1-1/+1
2010-01-26mesa: remove redundant _MaxElement computationBrian Paul1-6/+0
Eric added some new code to check if offset < obj_size before computing _MaxElement but my original code was still present afterward and it clobbered the _MaxElement value. Not sure if this came from a bad merge or what.
2010-01-18mesa: Remove unnecessary header from state.c.Vinson Lee1-1/+0
2009-09-24mesa/main: Make FEATURE_pixel_transfer follow feature conventions.Chia-I Wu1-4/+0
As shown in mfeatures.h, this allows users of pixel.h to work without knowing if the feature is available.
2009-08-07mesa: use a more logical flag in _mesa_set_vp_override()Brian Paul1-1/+1
2009-08-03texenv: Add missing dependency on VP changes.Eric Anholt1-1/+2
Funny thing is I annotated this dependency in e5f63c403b767f9974e8eb5d412c012b8a69287f, but didn't actually use it.
2009-07-16texenv: Calculate whether we need to do secondary color on our own.Eric Anholt1-1/+1
The _TriangleCaps bit is deprecated, not updated when we require, and is set based on state that hasn't been updated at that point in _mesa_update_state_locked(). Fixes incorrect clear color in glsl/twoside.c with meta_clear_tris.
2009-07-14Fix state flag dependencies for fixed function fragment program updates.Eric Anholt1-1/+1
I started looking into why _NEW_ARRAY punishes us, and while annotating dependencies noticed that a bunch of dependencies were missing.
2009-07-07Cap array elements at 0 when passed an invalid pointer for an array object.Eric Anholt1-0/+10
Otherwise, a pointer greater than the size would underflow and give a large maximum element. Reviewed-by: Brian Paul <brianp@vmware.com> (previous version)
2009-05-22mesa: add missing update_min() call in update_arrays()Brian Paul1-1/+1
2009-05-22Merge branch 'mesa_7_5_branch'Brian Paul1-2/+2
2009-05-22mesa: fix loop over generic attribs in update_arrays()Brian Paul1-1/+1
2009-05-21mesa: move gl_array_attrib::_MaxElement to gl_array_object::_MaxElementBrian Paul1-1/+1
This value is per array object.
2009-05-07mesa: Compute gl_client_array->_MaxElement during array validationBrian Paul1-27/+61
Used to be done in the glVertex/Normal/Color/etc/Pointer() calls but if the VBO was reallocated the size could change. New _NEW_BUFFER_OBJECT state flag.
2009-05-07mesa: use local var to make code a bit more conciseBrian Paul1-36/+37
2009-04-21mesa: new _NEW_PROGRAM_CONSTANTS flagBrian Paul1-1/+35
This state flag will be used to indicate that vertex/fragment program constants have changed. _NEW_PROGRAM will be used to indicate changes to the vertex/fragment shader itself, or misc related state. _NEW_PROGRAM_CONSTANTS is also set whenever a program parameter that's tracking GL state has changed. For example, if the projection matrix is in the parameter list, calling glFrustum() will cause _NEW_PROGRAM_CONSTANTS to be set. This will let to remove the need for dynamic state atoms in some drivers. For now, we still set _NEW_PROGRAM in all the places we used to. We'll no longer set _NEW_PROGRAM in glUniform() after drivers/etc have been updated.
2009-04-15mesa: Update texenv program when _NEW_ARRAYS is updated as well.Eric Anholt1-1/+2
This fixes a regression in fbotest1 on 915, where a transition from color+vertex array enabled to texcoord0+vertex array enabled wouldn't trigger program update on the second _mesa_update_state of DrawArrays, and we'd sample a constant texcoord of 0,0,0,1 instead of the array. The double state update in DrawArrays from 1680ef869625dc1fe9cf481b180382a34e0738e7 still needs fixing.
2009-03-07mesa: move glViewport and glDepthRange functions into new viewport.c fileBrian Paul1-0/+1
A bit of refactoring with an eye toward ES2 and GL 3.1
2009-03-03mesa: fix sw fallback state validation bugBrian Paul1-10/+28
When a hw driver fell back to swrast, swrast wasn't always getting informed of program changes. When fixed function is translated into shaders, flags like _NEW_LIGHT, _NEW_TEXTURE, etc. should really signal _NEW_PROGRAM. In this case, swrast wasn't seeing _NEW_PROGRAM when new fragment shaders were generated.
2009-03-02mesa: add ctx->Stencil._Enabled fieldBrian Paul1-1/+1
Only true if stenciling is enabled, and there's a stencil buffer.
2009-02-10Merge commit 'origin/gallium-master-merge'Brian Paul1-2/+62
This is the big merge of the gallium-0.2 branch into master. gallium-master-merge was just the staging area for it. Both gallium-0.2 and gallium-master-merge are considered closed now. Conflicts: progs/demos/Makefile src/mesa/main/state.c src/mesa/main/texenvprogram.c
2009-02-10mesa: another fix for program/texture state validationBrian Paul1-6/+36
This fixes a regression introduced in 46ae1abbac6837d051c10b2e8b57eab3d4958ff4 Break program validation into two steps, do part before texture state validation and do the rest after: 1. Determine Vertex/Fragment _Enabled state. 2. Update texture state. 3. Determine pointers to current Vertex/Fragment programs (which may involve generating new "fixed-function" programs). See comments in the code for more details of the dependencies.
2009-02-10mesa: s/_IMAGE_NEW_TRANSFER_STATE/_MESA_NEW_TRANSFER_STATE/ to be more ↵Brian Paul1-1/+1
consistant with other flags
2009-02-10mesa: fix/change state validation order for program/texture stateBrian Paul1-13/+12
Program state needs to be updated before texture state since the later depends on the former. Fixes piglit texgen failure. The second time through the modes (press 't' three times) we disable the fragment program and return to conventional texture mode. State validation failed here because update_texture() saw stale fragment program state.
2009-01-09mesa: Remove _Active and _UseTexEnvProgram flags from fragment programs.Eric Anholt1-11/+0
There was a note in state.c about _Active deserving to die, and there were potential issues with it due to i965 forgetting to set _UseTexEnvProgram. Removing both simplifies things. Reviewed-by: Brian Paul <brianp@vmware.com>
2009-01-07mesa: Remove _Active and _UseTexEnvProgram flags from fragment programs.Eric Anholt1-11/+0
There was a note in state.c about _Active deserving to die, and there were potential issues with it due to i965 forgetting to set _UseTexEnvProgram. Removing both simplifies things. Reviewed-by: Brian Paul <brianp@vmware.com>
2008-12-18mesa: remove unneeded _mesa_reference_fragprog() callBrian Paul1-4/+2
The subsequent if/else cases always call _mesa_reference_fragprog() anyway.
2008-12-17mesa: remove unneeded _mesa_reference_fragprog() callBrian Paul1-4/+2
The subsequent if/else cases always call _mesa_reference_fragprog() anyway.
2008-11-13mesa: fix generation of fixed function state when no vp existsAlan Hourihane1-43/+41
2008-11-13mesa: fix generation of fixed function state when no vp existsAlan Hourihane1-43/+41
2008-10-15Merge commit 'origin/gallium-0.1' into gallium-0.2Keith Whitwell1-3/+26
Conflicts: src/mesa/main/context.c
2008-10-10mesa: new _mesa_set_vp_override() function for driver-override of vertex programBrian Paul1-3/+26
Patch provide by Keith. Used in state tracker by DrawPixels to indicate that the state tracker (driver) is using its own vertex program. This prevents the texenvprogram code from replacing conventional shader inputs with state vars. Fixes glDraw/CopyPixels regressions.
2008-10-10Merge commit 'origin/master' into gallium-0.2Keith Whitwell1-6/+0
Conflicts: src/mesa/glapi/descrip.mms src/mesa/shader/grammar/descrip.mms
2008-10-10Merge commit 'origin/gallium-0.1' into gallium-0.2Keith Whitwell1-1/+41
Conflicts: src/gallium/auxiliary/gallivm/instructionssoa.cpp src/gallium/auxiliary/gallivm/soabuiltins.c src/gallium/auxiliary/rtasm/rtasm_x86sse.c src/gallium/auxiliary/rtasm/rtasm_x86sse.h src/mesa/main/texenvprogram.c src/mesa/shader/arbprogparse.c src/mesa/shader/prog_statevars.c src/mesa/state_tracker/st_draw.c src/mesa/vbo/vbo_exec_draw.c
2008-10-07mesa: replace GLuint with GLbitfield to be clearer about usageBrian Paul1-1/+1
Also, fix up some comments to be doxygen style.
2008-10-03mesa: avoid generating constant vertex attributes in fixedfunc programsKeith Whitwell1-1/+37
Keep track of enabled/active vertex attributes. Keep track of potential vertex program outputs. When generating fragment program, replace references to fragment attributes which are effectively non-varying and non-computed passthrough attributes with references to the new CURRENT_ATTRIB tracked state value. Only downside is slight ugliness in VBO code where we need to validate state twice in succession.
2008-10-03mesa: add new internal state for tracking current vertex attribsKeith Whitwell1-0/+4
2008-09-26mesa: remove invalid assertions that programs have parametersBrian Paul1-6/+0
Fixes failure with demos/fplight.c
2008-09-21Merge branch 'master' into gallium-0.2Keith Whitwell1-2/+0
Conflicts: src/mesa/glapi/glapi.h src/mesa/main/api_exec.c src/mesa/main/attrib.c src/mesa/main/clear.c src/mesa/main/context.c src/mesa/main/mfeatures.h src/mesa/main/mipmap.c src/mesa/main/mipmap.h src/mesa/main/readpix.c src/mesa/main/sources src/mesa/main/state.c src/mesa/main/texformat.c src/mesa/main/texparam.c src/mesa/main/texstate.c src/mesa/vbo/vbo_context.c src/mesa/x86/common_x86_asm.S
2008-09-21mesa: refactor: move #define FEATURE flags into new mfeatures.h fileKeith Whitwell1-0/+4
Also, check the FEATURE flags in many places. (cherry picked from commit 40d1a40f294f1ed2dacfad6f5498322fc08cc2d1) Conflicts: src/mesa/main/config.h src/mesa/main/context.c src/mesa/main/texobj.c src/mesa/main/texstate.c src/mesa/main/texstore.c
2008-09-21mesa: refactor: move _mesa_init_exec_table() into new api_exec.c fileBrian Paul1-796/+7
(cherry picked from commit b36e6f0baf64491772b8e1a1cddf68a7dcf8ee22)
2008-09-21mesa: refactor: move glReadPixels code into new readpix.c fileBrian Paul1-2/+3
2008-09-21mesa: refactor: move glPixelStore function into new pixelstore.c fileBrian Paul1-0/+1
2008-09-21mesa: remove EXT/NV suffixes from _mesa_PointParameter functionsBrian Paul1-4/+4
2008-09-21mesa: move fixed function vertex program builder from tnl to core mesaKeith Whitwell1-32/+66
Also unify caching of fragment and vertex programs in shader/prog_cache.c` Brought across from gallium-0.2
2008-09-18Merge commit 'origin/master' into gallium-0.2Keith Whitwell1-4/+4
Conflicts: progs/trivial/Makefile src/mesa/glapi/glthread.c
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-16 21:29:50 +0000