summaryrefslogtreecommitdiff
path: root/src/mesa/main
AgeCommit message (Collapse)Author
2009-08-06Ensure GL_EXT_blend_equation_separate is enabled when 2.0 is enabled.Alan Hourihane
2009-08-05mesa/main: Add functions to clear and dirty texture objects.Chia-I Wu
This commit adds a function to clear a texture object such that there is no image data associated with it, and a function to dirty it so that it will be re-tested for completeness. Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2009-08-05Merge branch 'mesa_7_5_branch'Brian Paul
Conflicts: src/mesa/main/state.c
2009-08-05mesa: generate GL_INVALID_OPERATION for missing z/stencil when blittingBrian Paul
If glBlitFramebuffer() is called with GL_DEPTH_BUFFER_BIT or GL_STENCIL_BUFFER_BIT and the src/dst depth/stencil buffers are absent, report an error.
2009-08-05mesa: make _mesa_clip_blit() a shared functionBrian Paul
2009-08-04mesa: added gl_shader::SourceChecksum field (for debug purposes)Brian Paul
2009-08-04mesa: added _mesa_str_checksum()Brian Paul
2009-08-04mesa: clean-up error debug/count codeBrian Paul
2009-08-04mesa: reset ErrorDebugCount to zero in glGetString()Brian Paul
2009-08-04mesa: better texture dump/debug codeBrian Paul
2009-08-04mesa: more error message info for vertex pointer functionsBrian Paul
2009-08-04mesa: more glGetTexImage() error checking consolidation, new assertionBrian Paul
2009-08-04texenv: Use VP->Current, since _Current isn't updated at this point.Brian Paul
(cherry picked from master, commit a9ba1bfeb3a2852c6eda718e73c46c972a286648)
2009-08-04texenv: Match state.c in deciding whether we'll be using a vertex shader.Brian Paul
(cherry picked from master, commit 40990d9dfb20b69585859b2a45596aa46c20140a)
2009-08-04texenv: Add missing dependency on VP changes.Brian Paul
Funny thing is I annotated this dependency in e5f63c403b767f9974e8eb5d412c012b8a69287f, but didn't actually use it. (cherry picked from master, commit 03187571b63d97e3d1406d329c5e760e16ef3181) Conflicts: src/mesa/main/state.c
2009-08-03texenv: Use VP->Current, since _Current isn't updated at this point.Eric Anholt
2009-08-03texenv: Match state.c in deciding whether we'll be using a vertex shader.Eric Anholt
2009-08-03texenv: Add missing dependency on VP changes.Eric Anholt
Funny thing is I annotated this dependency in e5f63c403b767f9974e8eb5d412c012b8a69287f, but didn't actually use it.
2009-07-30mesa: re-enable _mesa_source_buffer_exists() callBrian Paul
Somehow this code wound up inside a comment a while back.
2009-07-30mesa: get_current_tex_unit() helper functionBrian Paul
2009-07-30mesa: refactor glGetTexImage error checking codeBrian Paul
2009-07-30mesa: simplify _mesa_select_tex_image()Brian Paul
2009-07-30mesa: simplify _mesa_set_tex_image()Brian Paul
2009-07-28Merge branch 'mesa_7_5_branch'Brian Paul
Conflicts: Makefile configs/default docs/relnotes.html src/mesa/main/version.h
2009-07-27mesa: separate some finite/pragma Watcom stuffBrian Paul
2009-07-22mesa: bump version to 7.5.1Brian Paul
2009-07-17Merge branch 'mesa_7_5_branch'Brian Paul
Conflicts: Makefile progs/glsl/multitex.c src/mesa/main/enums.c src/mesa/main/state.c src/mesa/main/texenvprogram.c src/mesa/main/version.h
2009-07-17mesa: set version to 7.5Brian Paul
2009-07-16texenv: Calculate whether we need to do secondary color on our own.Eric Anholt
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-15Fix state flag dependencies for fixed function fragment program updates.Brian Paul
I started looking into why _NEW_ARRAY punishes us, and while annotating dependencies noticed that a bunch of dependencies were missing. (cherry picked from master, commit e5f63c403b767f9974e8eb5d412c012b8a69287f)
2009-07-15mesa: recognize and eliminate repeated error messagesKeith Whitwell
2009-07-15mesa: split out errorstring switch from _mesa_errorKeith Whitwell
Move a chunk of code out of _mesa_error()
2009-07-15mesa: remove dead code in _mesa_errorKeith Whitwell
Remove early and unused snprintf and where[] string.
2009-07-15mesa: don't call getenv every time _mesa_error is calledKeith Whitwell
Buggy apps can generate thousands of mesa_error calls. Don't need to keep calling getenv to retreive the same MESA_DEBUG string each time.
2009-07-14Fix state flag dependencies for fixed function fragment program updates.Eric Anholt
I started looking into why _NEW_ARRAY punishes us, and while annotating dependencies noticed that a bunch of dependencies were missing.
2009-07-14mesa: fix texture border color code for glPopAttrib()Brian Paul
The texture object's border color used to be stored as GLchan but it's been GLfloat for a while now.
2009-07-14mesa: regenerated enums.c fileBrian Paul
2009-07-14mesa: regenerated enums.c fileBrian Paul
2009-07-09mesa: From float type modifier from values to large for singlesIan Romanick
The values 2147483648.0 and 4294967294.0 are too larget to be stored in single precision floats. Forcing these to be singles causes bits to be lost, which results in errors in some pixel transfer tests. This fixes bug #22344. (cherry picked from commit 70e72070fce6aa1e0918dcc62c1949465cee69f7)
2009-07-07mesa: only use fallback texture when using shaders, not fixed-function (take ↵Brian Paul
two) The semantics are a little different for shaders vs. fixed-function when trying to use an incomplete texture. The fallback texture returning (0,0,0,1) should only be used with shaders. For fixed function, the texture unit is truly disabled/ignored. Fixes glean fbo test regression. (cherry picked from commit 01e16befd4809e3e93ee7855a4a5d7df9fe010d9) (cherry picked from commit 51325f44d1e7e62b47795a79f8038d10dc5bc30b) [anholt: squashed these two together from master, skipping the mess in between]
2009-07-07Cap array elements at 0 when passed an invalid pointer for an array object.Eric Anholt
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-07-03Merge branch 'mesa_7_5_branch'Jakob Bornecrantz
Conflicts: src/mesa/main/dlist.c src/mesa/vbo/vbo_save_api.c
2009-06-30mesa/dlist: fixes and improvements for material cachingKeith Whitwell
Only short-circuit material call if *all* statechanges from this call are cached. Some material calls (eg with FRONT_AND_BACK) change more than one piece of state -- need to check all of them before returning. Also, Material calls are legal inside begin/end pairs, so don't need to be as careful about begin/end state as with regular statechanges (like ShadeModel) when caching. Take advantage of this and do better caching.
2009-06-30mesa/dlist: don't cache state which may not be replayed on CallListKeith Whitwell
Statechanges which occur before the first End in a display list may not be replayed when the list is called, in particular if it is called from within a begin/end pair. Recognize vulnerable statechanges and do not use them to fill in the state cache.
2009-06-30mesa/dlist: invalidate cached dlist compile state after CallListKeith Whitwell
When compiling a display list containing a CallList, it is necessary to invalidate any assumption about the GL state after the recursive call completes.
2009-06-30Merge branch 'mesa_7_5_branch' into dlist-statechange-shortcircuitKeith Whitwell
Need this to pick up fixes for per-vertex materials.
2009-06-30mesa: remove whitespaceKeith Whitwell
2009-06-30mesa: remove dead constant pointsize code from ffvertex_prog.cKeith Whitwell
2009-06-30mesa: remove dead vertex fog code from ffvertex_prog.cKeith Whitwell
2009-06-30mesa: fix material inputs in ffvertex_prog.cKeith Whitwell
Varying material inputs were not being picked up from the same slots where the VBO code is currently placing them (GENERIC0 and above). Most often they were just being ignored.