summaryrefslogtreecommitdiff
path: root/src/mesa/main
AgeCommit message (Collapse)Author
2008-11-05Merge commit 'origin/gallium-0.1' into gallium-0.2Brian Paul
Conflicts: src/gallium/auxiliary/rtasm/rtasm_execmem.c src/mesa/shader/slang/slang_emit.c src/mesa/shader/slang/slang_log.c src/mesa/state_tracker/st_atom_framebuffer.c
2008-11-01Merge commit 'origin/master' into gallium-0.2Alan Hourihane
Conflicts: src/mesa/shader/slang/library/slang_vertex_builtin_gc.h
2008-11-01mesa: additional debug flags for glsl debug/disassemblyBrian Paul
2008-11-01mesa: additional debug flags for glsl debug/disassemblyBrian Paul
2008-10-31mesa: fix a typo in the previous commitXiang, Haihao
2008-10-30mesa: fix an issue in _mesa_PointParameterfv().Xiang, Haihao
2008-10-27Merge commit 'origin/master' into gallium-0.2Alan Hourihane
2008-10-23mesa: remove calls to _mesa_adjust_image_for_convolution(), use texImage fieldsBrian Paul
The texImage->Width/Height fields will have the post-convolution width/height.
2008-10-22mesa: move convolution image adjustment code for glCopyTexSubImage1/2/3D()Brian Paul
Do it after initial error checking, after we know the texture's internal format.
2008-10-22mesa: some re-org of glCopyTexSubImage1/2/3D() error checkingBrian Paul
2008-10-22mesa: in textore.c, only adjust image for convolution if image is a color formatBrian Paul
Makes things consistant with the code in teximage.c. We only want to apply convolution to color formats (not depth/index formats)
2008-10-20mesa: note that texcoords are generated by setup routines when pointsprite ↵Keith Whitwell
enabled
2008-10-16mesa: fix error codes in _mesa_GetObjectParameterivARB(), bug 17861Brian Paul
2008-10-15Merge commit 'origin/gallium-0.1' into gallium-0.2Keith Whitwell
Conflicts: src/mesa/main/context.c
2008-10-14mesa: modify fixed function vertex programs not to reference constant attributesKeith Whitwell
2008-10-10Merge commit 'origin/master' into gallium-0.2Brian Paul
2008-10-10mesa: fix asst. issues in _mesa_texstore_argb8888()Brian Paul
If we shift bytes into the texel word (or use the PACK_COLOR_8888 macro), we don't have to worry about big vs. little endian. See comments about texel formats in texformat.h. Remove an unneeded/incorrect else-if clause that produced wrong results on big-endian systems.
2008-10-10mesa: remove unneeded includesBrian Paul
2008-10-10mesa: fix error codes in _mesa_GetObjectParameterivARB(), bug 17861Brian Paul
2008-10-10mesa: rename macro params to emphasize that there's no particular color orderingBrian Paul
2008-10-10mesa: remove unneeded includesBrian Paul
2008-10-10mesa: new _mesa_set_vp_override() function for driver-override of vertex programBrian Paul
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 Whitwell
Conflicts: src/mesa/glapi/descrip.mms src/mesa/shader/grammar/descrip.mms
2008-10-10Merge commit 'origin/gallium-0.1' into gallium-0.2Keith Whitwell
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: Pass the context to query object delete cb to avoid null dereference.Eric Anholt
2008-10-07mesa: replace GLuint with GLbitfield to be clearer about usageBrian Paul
Also, fix up some comments to be doxygen style.
2008-10-07mesa: protect against segfault in get_fp_input_mask()Keith Whitwell
2008-10-06mesa: fix convolve/convolution mix-upsBrian
2008-10-06mesa: fix convolve/convolution mix-upsBrian
2008-10-06mesa: updated _mesa_delete_query() commentsBrian Paul
2008-10-06mesa: add missing GLcontext param to _mesa_delete_query().Brian Paul
Fixes vtk crash and others.
2008-10-06mesa: add missing GLcontext param to _mesa_delete_query().Brian Paul
Fixes vtk crash and others.
2008-10-04mesa: handle vertex program enabled case also in texenvprogram.cKeith Whitwell
2008-10-03mesa: avoid generating constant vertex attributes in fixedfunc programsKeith Whitwell
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 Whitwell
2008-10-03mesa: shrink texenvprogram state key structKeith Whitwell
2008-10-02mesa: fix temp register allocation problems.Brian Paul
Complex texcombine modes were running out of registers (>32 registers for 8 tex units).
2008-10-01Unify ARB_depth_texture and SGIX_depth_textureIan Romanick
The ARB extension is a superset of the older SGIX extension. Any hardware that can support the SGIX version can also support the ARB version. In Mesa, any driver that supports one also supports the other. This unification just simplifies some bits of code.
2008-09-29GLSL: Implement GL_OBJECT_TYPE_ARB queryIan Romanick
The GL_OBJECT_TYPE_ARB query is handled directly in _mesa_GetObjectParamterivARB because it is only supported in the extension version of the shanding language API. glGetProgramiv and glGetShaderiv should not accept this enum.
2008-09-29mesa: asst updates for VMSJouk Jansen
2008-09-29mesa: drop calloc from _mesa_get_fixed_func_vertex_programShunichi Fuji
Signed-off-by: Shunichi Fuji <palglowr@gmail.com>
2008-09-26mesa: fix temp register allocation problems.Brian Paul
Complex texcombine modes were running out of registers (>32 registers for 8 tex units).
2008-09-26mesa: remove invalid assertions that programs have parametersBrian Paul
Fixes failure with demos/fplight.c
2008-09-26mesa: fix param indexingBrad King
2008-09-26mesa: fix/simplify initialization of vertex/fragment program limitsBrian Paul
Defaults for program length, num ALU instructions, num indirections, etc. basically indicate no limit for software rendering. Driver should override as needed.
2008-09-26mesa: increase MAX_INSTRUCTIONSBrian Paul
2008-09-26mesa: fix swizzle failure, fix typoBrian Paul
2008-09-26mesa: fix default buffer object access valueBrian Paul
2008-09-26mesa: fix indentingKeith Whitwell
2008-09-26Merge commit 'origin/master' into HEADKeith Whitwell
Conflicts: src/mesa/vbo/vbo.h src/mesa/vbo/vbo_exec_api.c src/mesa/vbo/vbo_exec_draw.c