Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | improved fog comment | Brian | 2007-04-18 | 1 | -1/+1 |
| | |||||
* | Enable texture sampling for vertex programs/shaders. | Brian | 2007-04-17 | 1 | -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 field | Richard Hughes | 2007-04-07 | 1 | -2/+2 |
| | |||||
* | Implement support for GL_ARB_draw_buffers with GL_MAX_DRAW_BUFFERS > 1. | Brian | 2007-03-11 | 1 | -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 formatting | Brian | 2007-03-10 | 1 | -10/+11 |
| | |||||
* | Remove unneeded _Fragment/VertexShaderPresent fields, update comments. | Brian | 2007-02-24 | 1 | -4/+0 |
| | |||||
* | Merge branch 'origin' into glsl-compiler-1 | Brian | 2007-02-22 | 1 | -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++ warnings | Brian | 2007-01-23 | 1 | -2/+2 |
| | | |||||
| * | don't allow fog when using a fragment shader (bug 9346) | Brian | 2006-12-16 | 1 | -2/+5 |
| | | |||||
* | | Merge SWvertex texcoord and varying fields into attrib[] array field. | Brian | 2007-02-05 | 1 | -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 field | Brian | 2007-02-02 | 1 | -1/+0 |
| | | |||||
* | | Remove if (tObj) conditional so that texture units without a texture image | Brian | 2007-01-08 | 1 | -5/+6 |
| | | | | | | | | return black (0,0,0,1) when sampled. | ||||
* | | Overhaul of GLSL API functions, dispatching, etc. | Brian | 2006-12-19 | 1 | -1/+1 |
| | | |||||
* | | Updated includes. | Brian | 2006-12-14 | 1 | -1/+1 |
| | | |||||
* | | Checkpoint for GLSL compiler changes. | Brian | 2006-12-13 | 1 | -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 Paul | 2006-11-02 | 1 | -0/+5 |
| | |||||
* | make use of Parameters->StateFlags in _swrast_update_fragment_program() | Brian Paul | 2006-10-31 | 1 | -7/+4 |
| | |||||
* | We need to call _mesa_load_state_parameters() whenever a fragment program | Brian Paul | 2006-10-31 | 1 | -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 Paul | 2006-10-01 | 1 | -1/+1 |
| | |||||
* | more changes for runtime renderbuffer depths | Brian Paul | 2006-09-29 | 1 | -3/+5 |
| | |||||
* | Initial work for supporting different renderbuffer color depths at runtime. | Brian Paul | 2006-09-25 | 1 | -10/+15 |
| | |||||
* | Use _Enabled rather than _Active when checking for fragment shaders | Keith Whitwell | 2006-09-22 | 1 | -6/+6 |
| | |||||
* | Move call to _swrast_update_rasterflags() since it depends on the | Brian Paul | 2006-08-29 | 1 | -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 with | Brian Paul | 2006-07-20 | 1 | -7/+7 |
| | | | | "gl_" to match other structs. | ||||
* | Add const qualifiers in a number of places. | Brian Paul | 2006-05-23 | 1 | -1/+1 |
| | |||||
* | Replace ctx->Const.MaxTextureUnits w/ ctx->Const.MaxTexture[Coord/Image]Units | Brian Paul | 2006-04-14 | 1 | -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_20060325 | Brian Paul | 2006-03-26 | 1 | -0/+81 |
| | |||||
* | remove carriage returns | Brian Paul | 2006-03-25 | 1 | -732/+732 |
| | |||||
* | GLSL fixes: | Michal Krol | 2006-03-21 | 1 | -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 mask | Brian Paul | 2006-02-28 | 1 | -0/+5 |
| | |||||
* | New comments, clean-up of fields related to point/line/triangle validation. | Brian Paul | 2006-01-26 | 1 | -6/+6 |
| | |||||
* | Added OSMesaColorClamp(), bug 4917 | Brian Paul | 2005-11-12 | 1 | -0/+6 |
| | |||||
* | Move stuff common to vertex/fragment_program into the base class, including: | Brian Paul | 2005-11-12 | 1 | -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 #include | Brian Paul | 2005-11-05 | 1 | -3/+0 |
| | |||||
* | check swrast->_FogEnabled instead of ctx->Fog.Enabled | Brian Paul | 2005-10-31 | 1 | -1/+2 |
| | |||||
* | Rework the texture filtering functions a bit. | Brian Paul | 2005-09-16 | 1 | -40/+20 |
| | | | | No need to pass the texture unit number as an argument. | ||||
* | more GLuint->GLbitfield changes | Brian Paul | 2005-09-16 | 1 | -3/+3 |
| | |||||
* | Replace GLuint with GLbitfield where appropriate. Also replace GLuint | Brian Paul | 2005-09-15 | 1 | -1/+1 |
| | | | | with GLboolean in a few places. | ||||
* | Update includes post-splitting of s_texture.c | Brian Paul | 2005-09-15 | 1 | -1/+1 |
| | |||||
* | remove obsolete CurrentBufferBit | Brian Paul | 2005-09-05 | 1 | -5/+0 |
| | |||||
* | Rearrange the code related to GL_ARB_occlusion_object to generalize query | Brian Paul | 2005-08-27 | 1 | -1/+1 |
| | | | | objects for future types of queries. | ||||
* | removed GL_HP_occlusion_test extension | Brian Paul | 2005-08-25 | 1 | -3/+3 |
| | |||||
* | Remove NEW_RENDERBUFFER stuff. | Brian Paul | 2005-07-01 | 1 | -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 pixel | Keith Whitwell | 2005-05-11 | 1 | -1/+1 |
| | | | | fog. | ||||
* | Major check-in of changes for GL_EXT_framebuffer_object extension. | Brian Paul | 2005-05-04 | 1 | -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 program | Keith Whitwell | 2005-05-04 | 1 | -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_shader | Dave Airlie | 2004-12-19 | 1 | -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 Paul | 2004-12-18 | 1 | -4/+1 |
| | |||||
* | Removed _swrast_validate_pbo_access(). | Brian Paul | 2004-10-31 | 1 | -22/+0 |
| | | | | In x11 driver, map/unmap PBO as needed in DrawPixels functions. | ||||
* | Fix minor fog / fragment program state bug. | Brian Paul | 2004-10-13 | 1 | -11/+14 |
| | | | | Don't add diffuse and specular colors when using fragment program. |