aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa/swrast/s_context.c
Commit message (Collapse)AuthorAgeFilesLines
* improved fog commentBrian2007-04-181-1/+1
|
* Enable texture sampling for vertex programs/shaders.Brian2007-04-171-2/+2
| | | | | | | This is a bit of a hack for now because the tnl module is using the swrast module to fetch texels. The texture fetch/filter code should probably be moved into the main/ module since it doesn't really depend upon other swrast code.
* fix references to non-existant sz4 fieldRichard Hughes2007-04-071-2/+2
|
* Implement support for GL_ARB_draw_buffers with GL_MAX_DRAW_BUFFERS > 1.Brian2007-03-111-0/+41
| | | | | | GL_MAX_DRAW_BUFFERS is currently 4. Added gl_FragData[] output for fragment programs. In _swrast_write_rgba_span() loop over the color outputs/renderbuffers.
* clean-up formattingBrian2007-03-101-10/+11
|
* Remove unneeded _Fragment/VertexShaderPresent fields, update comments.Brian2007-02-241-4/+0
|
* Merge branch 'origin' into glsl-compiler-1Brian2007-02-221-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/main/state.c src/mesa/shader/program.c src/mesa/shader/program.h src/mesa/shader/programopt.c src/mesa/shader/slang/slang_execute.c src/mesa/sources src/mesa/swrast/s_arbshader.c src/mesa/swrast/s_context.c src/mesa/swrast/s_span.c src/mesa/swrast/s_zoom.c src/mesa/tnl/t_context.c src/mesa/tnl/t_save_api.c src/mesa/tnl/t_vb_arbprogram.c src/mesa/tnl/t_vp_build.c src/mesa/tnl/t_vtx_eval.c
| * silence C++ warningsBrian2007-01-231-2/+2
| |
| * don't allow fog when using a fragment shader (bug 9346)Brian2006-12-161-2/+5
| |
* | Merge SWvertex texcoord and varying fields into attrib[] array field.Brian2007-02-051-2/+54
| | | | | | | | | | Fragment texcoords and varying code is now unified in the point/line/triangle rasterization code. In the future, merge color, fog, etc. attribs.
* | get rid of unused span->start fieldBrian2007-02-021-1/+0
| |
* | Remove if (tObj) conditional so that texture units without a texture imageBrian2007-01-081-5/+6
| | | | | | | | return black (0,0,0,1) when sampled.
* | Overhaul of GLSL API functions, dispatching, etc.Brian2006-12-191-1/+1
| |
* | Updated includes.Brian2006-12-141-1/+1
| |
* | Checkpoint for GLSL compiler changes.Brian2006-12-131-15/+12
|/ | | | | | In brief: Check for enabled fragment program by looking at ctx->FragmentProgram._Current. New code for varying variables.
* always load frag prog state params for now (see comments)Brian Paul2006-11-021-0/+5
|
* make use of Parameters->StateFlags in _swrast_update_fragment_program()Brian Paul2006-10-311-7/+4
|
* We need to call _mesa_load_state_parameters() whenever a fragment programBrian Paul2006-10-311-1/+15
| | | | | | is enabled and we've changed any GL state that might be referenced by a fragment program (such as state.fog.params). Do this during swrast validation, not in _swrast_exec_fragment_program().
* New SWspan and SWspanarrays typedefs.Brian Paul2006-10-011-1/+1
|
* more changes for runtime renderbuffer depthsBrian Paul2006-09-291-3/+5
|
* Initial work for supporting different renderbuffer color depths at runtime.Brian Paul2006-09-251-10/+15
|
* Use _Enabled rather than _Active when checking for fragment shadersKeith Whitwell2006-09-221-6/+6
|
* Move call to _swrast_update_rasterflags() since it depends on theBrian Paul2006-08-291-3/+3
| | | | | results of _swrast_update_fog_state(). Fixes bug where first frame of progs/samples/fog.c does not show fog.
* Some structure renaming. Prefix vertex/fragment-related structs withBrian Paul2006-07-201-7/+7
| | | | "gl_" to match other structs.
* Add const qualifiers in a number of places.Brian Paul2006-05-231-1/+1
|
* Replace ctx->Const.MaxTextureUnits w/ ctx->Const.MaxTexture[Coord/Image]UnitsBrian Paul2006-04-141-7/+4
| | | | | | in various places. Note that ctx->Texture.CurrentUnit needs to be tested against Coord/Image limits when referenced, not just in glActiveTexture().
* merge from texman branchmesa_20060325Brian Paul2006-03-261-0/+81
|
* remove carriage returnsBrian Paul2006-03-251-732/+732
|
* GLSL fixes:Michal Krol2006-03-211-733/+732
| | | | | | | | | | | | | | | | | | - generate error on NULL pointers in glShaderSourceARB; - reinstall program object, if current, in glLinkProgramARB; - vertex and fragment shaders are optional in program object; - floor asm was wrongly computed for x86 back-end; - allow for (void) idiom in function prototypes; - all fixed-state uniforms are updated; - local variable initializers are working; - implement texture* and shadow* functions for vertex processor; - generate error if too many arguments in general constructor; - trim unused data in general constructor; - struct r-value field select was badly relocated; Changes: - add derived state gl_fog_attrib::_Scale; - add derived state gl_light::_CosCutoffNeg;
* check for active shader, set FRAGPROG_BIT in raster maskBrian Paul2006-02-281-0/+5
|
* New comments, clean-up of fields related to point/line/triangle validation.Brian Paul2006-01-261-6/+6
|
* Added OSMesaColorClamp(), bug 4917Brian Paul2005-11-121-0/+6
|
* Move stuff common to vertex/fragment_program into the base class, including:Brian Paul2005-11-121-1/+1
| | | | | | Instructions, InputsRead, OutputsWritten, and Parameters. Also, added debug functions: _mesa_print_instruction(), _mesa_print_program_parameters() and revamp _mesa_print_program().
* remove unneeded #includeBrian Paul2005-11-051-3/+0
|
* check swrast->_FogEnabled instead of ctx->Fog.EnabledBrian Paul2005-10-311-1/+2
|
* Rework the texture filtering functions a bit.Brian Paul2005-09-161-40/+20
| | | | No need to pass the texture unit number as an argument.
* more GLuint->GLbitfield changesBrian Paul2005-09-161-3/+3
|
* Replace GLuint with GLbitfield where appropriate. Also replace GLuintBrian Paul2005-09-151-1/+1
| | | | with GLboolean in a few places.
* Update includes post-splitting of s_texture.cBrian Paul2005-09-151-1/+1
|
* remove obsolete CurrentBufferBitBrian Paul2005-09-051-5/+0
|
* Rearrange the code related to GL_ARB_occlusion_object to generalize queryBrian Paul2005-08-271-1/+1
| | | | objects for future types of queries.
* removed GL_HP_occlusion_test extensionBrian Paul2005-08-251-3/+3
|
* Remove NEW_RENDERBUFFER stuff.Brian Paul2005-07-011-2/+0
| | | | | Now, OLD_RENDERBUFFER marks code that needs to eventually be removed when all the drivers are updated to no longer need the SetBuffer() function.
* Don't let FragmentProgram._Active influence choice of vertex vs pixelKeith Whitwell2005-05-111-1/+1
| | | | fog.
* Major check-in of changes for GL_EXT_framebuffer_object extension.Brian Paul2005-05-041-29/+6
| | | | | | | Main driver impacts: - new code for creating the Mesa GLframebuffer - new span/pixel read/write code Some drivers not yet updated/tested.
* Add a facility to route all rasterization through a fragment programKeith Whitwell2005-05-041-10/+10
| | | | | | | | | | | which is automatically generated to match the current texture environment state. Introduces a new value ctx->FragmentProgram._Active which is true when either _Enabled is true or there is such a fragment program ready to run. To test out on a driver running the software rasterizer, set MESA_TEX_PROG=t in the environment. It goes without saying that performance is lower for the software rasterizer in this mode.
* Implement software ATI_fragment_shaderDave Airlie2004-12-191-0/+4
| | | | no error detection, slow, may not be 100% correct but a good start
* Consolidate _swrast_write_texture_span() into _swrast_write_rgba_span().Brian Paul2004-12-181-4/+1
|
* Removed _swrast_validate_pbo_access().Brian Paul2004-10-311-22/+0
| | | | In x11 driver, map/unmap PBO as needed in DrawPixels functions.
* Fix minor fog / fragment program state bug.Brian Paul2004-10-131-11/+14
| | | | Don't add diffuse and specular colors when using fragment program.