summaryrefslogtreecommitdiff
path: root/src/mesa/main
AgeCommit message (Collapse)Author
2009-02-10Merge commit 'origin/gallium-master-merge'Brian Paul
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-10Merge commit 'origin/gallium-0.2' into gallium-master-mergeBrian Paul
2009-02-10mesa: remove the unused _mesa_UpdateTexEnvProgram() functionBrian Paul
2009-02-10mesa: another fix for program/texture state validationBrian Paul
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 Paul
consistant with other flags
2009-02-10mesa: fix/change state validation order for program/texture stateBrian Paul
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-02-09mesa: fixes for srgb formatsRoland Scheidegger
swizzling in fetch/store srgba/sargb functions fixed (consistent with equivalent non-srgb formats now).
2009-02-09fix _mesa_get_teximage for srgb texturesRoland Scheidegger
2009-02-09mesa: avoid setting texObj->_Complete = GL_FALSE when there's no state changeBrian Paul
Avoid a little bit of unneeded state validation and fixes a bug where the texture complete flags was set to false, but we didn't signal _NEW_TEXTURE. Fixes piglit tex1d-2dborder failure.
2009-02-09mesa: add no-change testing for a few more texture parametersBrian Paul
2009-02-09mesa: replace _mesa_unreference_framebuffer() with _mesa_reference_framebuffer()Brian Paul
2009-02-09mesa: merge gallium-0.2 into gallium-master-mergeBrian Paul
Merge commit 'origin/gallium-0.2' into gallium-master-merge Conflicts: Makefile docs/relnotes-7.4.html docs/relnotes.html src/mesa/drivers/dri/i965/brw_wm.h src/mesa/main/imports.c src/mesa/main/mtypes.h src/mesa/main/texcompress.c src/mesa/main/texenvprogram.c src/mesa/main/version.h src/mesa/vbo/vbo_exec_api.c src/mesa/vbo/vbo_save_draw.c
2009-02-09mesa: rework _mesa_reference_framebuffer() to look like ↵Brian Paul
_mesa_reference_renderbuffer() _mesa_unreference_framebuffer() is deprecated since _mesa_reference_framebuffer(ptr, NULL) can be used instead.
2009-02-07mesa: minor fixes to incomplete texture debug codeBrian Paul
2009-02-07mesa: debug code for printing info about textures, writing teximages to diskBrian Paul
2009-02-07mesa: code refactoring: move texcombine code into update_tex_combine()Brian Paul
2009-02-07mesa: minor clean-ups, remove unneeded conditionalBrian Paul
2009-02-07mesa: fix logic error in computing enableBits in update_texture_state()Brian Paul
If we had a vertex shader but no fragment shader (i.e. fixed function) we didn't get the right enabled texture targets. Fixes blank/white texture problem.
2009-02-06glsl: new MESA_GLSL env var for GLSL debugging featuresBrian Paul
Replaces the VERBOSE_GLSL, VERBOSE_GLSL_DUMP flags which only worked in debug builds. MESA_GLSL will work both in debug and non-debug builds. Also add facility to dump glUniform() calls to stdout.
2009-02-06Revert "mesa: meaningless whitespace change to see if git's working (ignore)"Brian Paul
This reverts commit b2e779988eeb595187933fe2122d86f8ccfe059c. I didn't mean to push this stuff yet. I'm having a bad git day...
2009-02-06mesa: meaningless whitespace change to see if git's working (ignore)Brian Paul
2009-02-04mesa: more info in error messagesBrian Paul
2009-02-04mesa: minor error msg improvementBrian Paul
2009-02-03mesa: simplify delete_wrapper()Brian Paul
2009-01-31mesa: more display list cleanupsBrian
Remove some unneeded fields. Rename some function parameters.
2009-01-31mesa: display list clean-upsBrian
Rename some structs and fields to be more consistant with the rest of mesa.
2009-01-31mesa: minor comments, clean-upsBrian
2009-01-31mesa: remove remnant of GL_SGIX_depth_textureBrian
2009-01-30mesa: simplify the _mesa_get_proxy_tex_image() functionBrian Paul
2009-01-30mesa: fix incorrect call to clear_teximage_fields() in _mesa_TexImage2D()Brian Paul
Fixes failed assertion / segfault for particular proxy texture tests.
2009-01-30mesa: add missing _mesa_reference_texobj() calls for texture array targetsBrian Paul
2009-01-30mesa: remove incorrect refcounting adjustment in ↵Brian Paul
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.
2009-01-29mesa: allow glFramebufferTexture1/2/3D(target = GL_READ/DRAW_FRAMEBUFFER)Brian Paul
This is part of GL_EXT_framebuffer_blit and GL_ARB_framebuffer_obbject.
2009-01-29mesa: fix a render to texture FBO validation bugBrian Paul
When glTexImage() is called we need to re-validate any FBOs that point to the texture (i.e. render-to-texture) since changing the texture's size/format will effect FBO completeness. We don't keep a list of all FBOs rendering into each texture (which would be a bit messy) so we check all FBOs in existance. To optimize this, the gl_texture_object->_RenderToTexture flag is used to avoid checking textures that have never been used as renderbuffers. So, we only walk over all FBOs (there's usually only a few) when glTexImage() modifies a RTT texture. Fixes a bug seen in shadowtex.c when toggling packed depth/stencil mode.
2009-01-29mesa: set version to 7.4 for mesa_7_4_branchBrian Paul
2009-01-29mesa: set version to 7.3Brian Paul
2009-01-28Make GL_ARB_draw_buffers mandatoryIan Romanick
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
2009-01-28Make GL_{EXT,SUN}_multi_draw_arrays and GL_IBM_multimode_draw_arrays mandatoryIan Romanick
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
2009-01-28Make GL_ARB_vertex_buffer_object mandatoryIan Romanick
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
2009-01-28Make GL_ARB_multisample mandatoryIan Romanick
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
2009-01-28Make GL_ARB_texture_compression mandatoryIan Romanick
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
2009-01-28mesa: remove GL_SGIX_shadow, GL_SGIX_shadow_ambient and GL_SGIX_depth_textureBrian Paul
Everyone should be using the newer/better ARB versions of these extensions.
2009-01-28mesa: additional GL_INVALID_OPERATION tests for texture swizzleBrian Paul
2009-01-28mesa: implement texture swizzling in swrastBrian Paul
And enable GL_EXT_texture_swizzle for software drivers.
2009-01-28mesa: set/get new state for GL_EXT_texture_swizzleBrian Paul
2009-01-27mesa: refactor glTexParameter codeBrian Paul
2009-01-27mesa: move call to _mesa_update_framebuffer_visual()Brian Paul
Update the visual info in the _mesa_test_framebuffer_completeness() function when we've determined the FBO to be "complete". Fixes regression seen in progs/demos/shadowtex.c
2009-01-26mesa: add missing texture_put_row_rgb() function in texrender.cRobert Ellison
The wrap_texture() function doesn't set the renderbuffer PutRowRGB() method, which is used to implement DrawPixels(). This fix adds an implementation of this method.
2009-01-23mesa: enable GL_NV_texture_env_combine4 for sw driversBrian Paul
2009-01-23mesa: updated fragment shader codegen for GL_NV_texture_env_combine4Brian Paul
Expand struct fields, increase loops and handle new 4-term ADD modes. Plus, some new assertions to catch switch/default cases that may be incorrect.