summaryrefslogtreecommitdiffstats
path: root/src/mesa
Commit message (Collapse)AuthorAgeFilesLines
* intel: Also update stencil bits in intel_update_wrapper().Michel Dänzer2009-07-031-0/+1
| | | | | Fixes assertion failure when binding depth/stencil texture to FBO stencil attachment.
* mesa/shaders: fix gl_NormalMatrix state parametersKeith Whitwell2009-07-031-1/+1
| | | | | | gl_NormalMatrix is the inverse transpose of the modelview matrix, but as every matrix here needs to be transposed, we end up with {MODELVIEW_MATRIX, INVERSE}.
* mesa: Assume depth textures have a single level unless told otherwise.José Fonseca2009-07-021-1/+3
|
* mesa: s/TRUE/GL_TRUEKeith Whitwell2009-07-021-1/+1
| | | | Fix compile breakage on Linux.
* glapi: ensure _mesa_lookup_prim_by_nr() is not clobbered on regenerationKeith Whitwell2009-07-021-0/+23
| | | | Propogate changes to enums.c back up to the python source.
* Merge commit 'origin/dlist-statechange-shortcircuit' into mesa_7_5_branchKeith Whitwell2009-07-028-37/+118
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: progs/trivial/Makefile Pull in a minimal version of statechange shortcircuiting in display list compilation. This affects only glMaterial and glShadeModel state, and includes quite a few tests to exercise various tricky cases. If this goes well, will consider extending to all state in the future.
| * mesa/vbo: fix compile and replay of nodes ending in a FALLBACKKeith Whitwell2009-06-301-13/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Where vbo save nodes are terminated with a call to DO_FALLBACK(), as in the case of a recursive CallList which is itself within a Begin/End pair, there two problems: 1) The display list node's primitive information was incorrect, stating the cut-off prim had zero vertices 2) On replay, we would get confused by a primitive that started in a node, but was terminated by individual opcodes. This change fixes the first problem by correctly terminating the last primitive on fallback, and the second by forcing the display list to use the Loopback path, converting all nodes into immediate-mode rendering. The loopback fix is a performance hit, but avoiding this would require a fairly large rework of this code.
| * mesa/dlist: fixes and improvements for material cachingKeith Whitwell2009-06-301-8/+16
| | | | | | | | | | | | | | | | | | | | | | 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.
| * mesa/dlist: don't cache state which may not be replayed on CallListKeith Whitwell2009-06-301-1/+5
| | | | | | | | | | | | | | | | | | 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.
| * mesa/dlist: invalidate cached dlist compile state after CallListKeith Whitwell2009-06-301-16/+24
| | | | | | | | | | | | When compiling a display list containing a CallList, it is necessary to invalidate any assumption about the GL state after the recursive call completes.
| * Merge branch 'mesa_7_5_branch' into dlist-statechange-shortcircuitKeith Whitwell2009-06-306-258/+151
| |\ | | | | | | | | | Need this to pick up fixes for per-vertex materials.
| * | mesa/dlist: restore missing SAVE_FLUSH_VERTICES in save_ShadeModelKeith Whitwell2009-06-301-0/+1
| | | | | | | | | | | | | | | Reorganization of ShadeModel to avoid flushing vertices too often ended up never flushing vertices due to omitted line of code.
| * | mesa/vbo: use _lookup_prim_by_nr for debuggingKeith Whitwell2009-06-304-4/+4
| | | | | | | | | | | | Switch over to specialized enum lookup for primitives
| * | mesa: add debug printer for primitive nameKeith Whitwell2009-06-302-0/+28
| | | | | | | | | | | | | | | | | | Add a simple version of _mesa_lookup_enum_by_nr() which expects a primitive enum (GL_POINTS..GL_POLYGON). This avoids some annoying duplicates when looking up primitives, such as the GL_FALSE/GL_POINTS clash.
| * | mesa/dlist: shortcircuit some redundant statechanges at compile timeKeith Whitwell2009-06-302-19/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, state-changes in mesa display lists are more or less a verbatim recording of the GL calls made during compilation. This change introduces a minor optimization to recognize and eliminate cases where the application emits redundant state changes, eg: glShadeModel( GL_FLAT ); glBegin( prim ) ... glEnd() glShadeModel( GL_FLAT ); glBegin( prim ) ... glEnd() The big win is when we can eliminate all the statechanges between two primitive blocks and combine them into a single VBO node. This commit implements state-change elimination for Material and ShadeModel only. This is enough to make a start on debugging, etc.
* | | mesa: ensure UsesFogFragCoord value is set for non-glsl shadersKeith Whitwell2009-07-022-0/+8
| | | | | | | | | | | | | | | | | | With recent changes to support frontfacing in glsl, it is necessary to ensure that the UsesFogFragCoord value is accurate in all shaders. We were previously not setting it for fixed-function and ARB_fs shaders.
* | | st/gl: Add stubs for CompressedTexSubImage[1D|3D]Jakob Bornecrantz2009-06-301-0/+27
| | |
* | | st/gl: Add support for glCompressedTexSubImageJakob Bornecrantz2009-06-301-0/+58
| | |
* | | mesa: Unbind depth/stencil surface from pipe_framebuffer when none is attached.José Fonseca2009-07-011-0/+2
| | |
* | | gallium: fix the front face semanticsZack Rusin2009-07-013-4/+45
| | | | | | | | | | | | | | | | | | | | | | | | mesa allocates both frontface and pointcoord registers within the fog coordinate register, by using swizzling. to make it cleaner and easier for drivers we want each of them in its own register. so when doing compilation from the mesa IR to tgsi allocate new registers for both and add new semantics to the respective declarations.
* | | i915: Fix assertion failure on remapping a non-BO-backed VBO.Eric Anholt2009-06-301-1/+4
| | | | | | | | | | | | | | | | | | Failure to set the obj->Pointer back to null tripped up the assertion. Bug #22428. (cherry picked from commit 57a06d3a48c9af1067ec05e3ad96c58f4b9b99be)
* | | mesa/vbo: fix compile and replay of nodes ending in a FALLBACKKeith Whitwell2009-06-301-13/+27
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Where vbo save nodes are terminated with a call to DO_FALLBACK(), as in the case of a recursive CallList which is itself within a Begin/End pair, there two problems: 1) The display list node's primitive information was incorrect, stating the cut-off prim had zero vertices 2) On replay, we would get confused by a primitive that started in a node, but was terminated by individual opcodes. This change fixes the first problem by correctly terminating the last primitive on fallback, and the second by forcing the display list to use the Loopback path, converting all nodes into immediate-mode rendering. The loopback fix is a performance hit, but avoiding this would require a fairly large rework of this code.
* | mesa: remove whitespaceKeith Whitwell2009-06-301-108/+108
| |
* | mesa: remove dead constant pointsize code from ffvertex_prog.cKeith Whitwell2009-06-301-17/+0
| |
* | mesa: remove dead vertex fog code from ffvertex_prog.cKeith Whitwell2009-06-301-84/+3
| |
* | mesa: fix material inputs in ffvertex_prog.cKeith Whitwell2009-06-301-39/+15
| | | | | | | | | | | | 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.
* | mesa: fix transform_points_3d_no_rot using undefined values in %xmm0Arthur HUILLET2009-06-302-0/+2
| | | | | | | | Signed-off-by: Arthur HUILLET <[email protected]>
* | mesa: Set FLUSH_EXPLICIT_BIT flags when calling FlushMappedBufferRange.José Fonseca2009-06-302-9/+22
| | | | | | | | As prescribed by ARB_map_buffer_range.
* | intel: added null ptr checkBrian Paul2009-06-291-1/+1
|/ | | | This fixes a segfault seen with piglit's fdo20701 test.
* glsl: check number of varying variables against the limitBrian Paul2009-06-261-4/+9
| | | | | | Link fails if too many varying vars. (cherry picked from master, commit cc58fbcf2c5c88f406818db60910f537e03610d6)
* mesa: raise MAX_VARYING (number of shader varying vars) to 16Brian Paul2009-06-261-1/+1
| | | | | | 16 is the limit for now because of various 32-bit bitfields. (cherry picked from master, commit 4e762395ef7e8c332c16fd0c11025cfa52763a45)
* intel / DRI2: Additional flush of fake front-buffer to real front-bufferIan Romanick2009-06-261-0/+11
| | | | | | | | | | | To maintain correctness, the server will copy the real front-buffer to a newly allocated fake front-buffer in DRI2GetBuffersWithFormat. However, if the DRI2GetBuffersWithFormat is triggered by glViewport, this will copy stale data into the new buffer. Fix this by flushing the current fake front-buffer to the real front-buffer in intel_viewport. Fixes bug #22288.
* mesa: bump version to 7.5-rc4Brian Paul2009-06-261-1/+1
|
* glsl: move/simplify error checking for 'return' statementsBrian Paul2009-06-261-22/+14
|
* glsl: overhaul 'return' statement handlingBrian Paul2009-06-263-215/+212
| | | | | | | A new node type (SLANG_OPER_RETURN_INLINED) is used to denote 'return' statements inside inlined functions which need special handling. All glean glsl1 tests pass for EmitContReturn=FALSE and TRUE.
* glsl: predicate assignments according to __returnFlagBrian Paul2009-06-261-4/+29
| | | | Fixes glean "function with early return (3)" case (when EmitContReturn=FALSE).
* glsl: added slang_variable::is_global fieldBrian Paul2009-06-261-0/+1
|
* glsl: silence a problem warningBrian Paul2009-06-261-1/+2
|
* glsl: code refactoring for return statementsBrian Paul2009-06-261-70/+88
|
* glsl: fix assorted regressions related to early-return-removalBrian Paul2009-06-262-14/+35
|
* glsl: comments, field reorderingBrian Paul2009-06-261-1/+4
|
* glsl: rework loop nesting codeBrian Paul2009-06-262-41/+87
|
* glsl: remove test for loop unrolling when we hit conditional cont/breakBrian Paul2009-06-261-4/+0
| | | | | This is no longer needed since we added the new _slang_loop_contains_continue_or_break() function/test.
* glsl: checkpoint: predicate __retVal = expr with __returnFlagBrian Paul2009-06-261-26/+60
| | | | The glean "function with early return (1)" test passes now.
* glsl: use new helper functions in _slang_gen_logical_and/or()Brian Paul2009-06-261-15/+9
|
* glsl: add commentsBrian Paul2009-06-261-0/+3
|
* glsl: checkpoint: replace 'return' with __returnFlag=true;Brian Paul2009-06-261-7/+68
| | | | Needed for "remove early returns" transformation.
* glsl: fix up scoping for parent/children in slang_operation_copy()Brian Paul2009-06-261-0/+9
| | | | This will need more testing, but no regressions seen so far.
* glsl: fix uninitialized var in _slang_gen_for_without_continue()Brian Paul2009-06-261-1/+1
|
* glsl: added slang_operation_free_children()Brian Paul2009-06-262-0/+17
|