summaryrefslogtreecommitdiffstats
path: root/src/mesa
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'mesa_7_5_branch'Jakob Bornecrantz2009-07-0319-311/+446
|\ | | | | | | | | | | Conflicts: src/mesa/main/dlist.c src/mesa/vbo/vbo_save_api.c
| * 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.
* | | radeon: Wait for BO idle if necessary before mapping it.Michel Dänzer2009-07-031-0/+2
| | | | | | | | | | | | Fixes fighting between GPU and software rendering with TTM.
* | | r300: Guard debugging output.Michel Dänzer2009-07-031-2/+3
| | |
* | | intel: Fall back on glBitmap with fog enabled.Eric Anholt2009-07-021-0/+6
| | | | | | | | | | | | | | | | | | | | | We would have to build the program with the appropriate fog mode, and also supply the fog coordinate if appropriate. Bug #19413.
* | | intel: Flush when mapping buffer objects so writes don't get reordered.Eric Anholt2009-07-022-0/+5
| | | | | | | | | | | | | | | While GEM covers this for execution it knows about, it doesn't know about the batchbuffer we're preparing. Fixes piglit vbo-map-remap.c testcase.
* | | vbo: If MapBufferRange fails, try MapBuffer instead.Corbin Simpson2009-07-021-1/+2
| | | | | | | | | | | | | | | Fixes segfaults with radeon winsys. (Probably libdrm_radeon doing something that it shouldn't.)
* | | intel: Fix leak of DRI option info due to using the wrong free routine.Eric Anholt2009-07-021-1/+1
| | |
* | | intel: Clean up leak of driver context structure on context destroy.Eric Anholt2009-07-021-1/+2
| | |
* | | intel: Init num_fences to clean up valgrind warning.Eric Anholt2009-07-021-1/+1
| | | | | | | | | | | | | | | Valgrind doesn't know that a successful getparam sets the target of the pointer, so just set the value beforehand.
* | | radeon/r200/r300: drop radeon renderbuffer private width/heightDave Airlie2009-07-025-15/+13
| | | | | | | | | | | | half stealing the code without taking the intel regions
* | | radeon/r300: use base width/height.Dave Airlie2009-07-022-12/+13
| | | | | | | | | | | | I suspect this might break TFP in some way but it makes firecube run here
* | | i965: fixes for JMPIXiang, Haihao2009-07-023-10/+14
| | | | | | | | | | | | | | | | | | | | | 1. the data type of <src1> (JMPI offset) must be D 2. execution size must be 1 3. NoMask 4. instruction compression isn't allowed.
* | | intel: Avoid pointer arithmetic on void *.Eric Anholt2009-06-301-1/+1
| | | | | | | | | | | | Bug #22000.
* | | i965: Increase G4X default VS URB allocation to actually allow 32 threads.Eric Anholt2009-06-301-3/+14
| | | | | | | | | | | | | | | This improves the performance of my GLSL demo by 30%. It also fixes the VS deadlock that ut2004 had, for reasons I can't explain. Bug #21330.
* | | i965: first attempt at handling URB overflow when there's too many vs outputsBrian Paul2009-06-302-4/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we can't fit all the VS outputs into the MRF, we need to overflow into temporary GRF registers, then use some MOVs and a second brw_urb_WRITE() instruction to place the overflow vertex results into the URB. This is hit when a vertex/fragment shader pair has a large number of varying variables (12 or more). There's still something broken here, but it seems close...
* | | i965: use BRW_MAX_MRFBrian Paul2009-06-301-1/+1
| | |
* | | i965: use BRW_MAX_GRF, BRW_MAX_MRFBrian Paul2009-06-301-2/+3
| | |
* | | i965: move BRW_MAX_GRF, define BRW_MAX_MRFBrian Paul2009-06-302-6/+8
| | |
* | | i965: defined BRW_MAX_MRFBrian Paul2009-06-301-0/+3
| | |
* | | i965: comments and a new assertionBrian Paul2009-06-301-2/+4
| | |
* | | 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.
* | | Merge branch 'mesa_7_5_branch'Brian Paul2009-06-304-9/+24
|\| | | | | | | | | | | | | | | | | Conflicts: src/mesa/vbo/vbo_exec_draw.c
| * | 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.