summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2009-07-03Merge branch 'mesa_7_5_branch'Jakob Bornecrantz
Conflicts: src/mesa/main/dlist.c src/mesa/vbo/vbo_save_api.c
2009-07-03intel: Also update stencil bits in intel_update_wrapper().Michel Dänzer
Fixes assertion failure when binding depth/stencil texture to FBO stencil attachment.
2009-07-03progs: revert damage to progs/SConscript from recent compressed texture commitKeith Whitwell
2009-07-03mesa/shaders: fix gl_NormalMatrix state parametersKeith Whitwell
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}.
2009-07-03st/wgl: don't advertise WGL_EXT_swap_interval stringKeith Whitwell
This is a tweak to a previous fix -- it's not necessary to actually advertise this extension to prevent these games from crashing -- they ignore the extension string anyway. It's sufficient to just have GetProcAddress return some dummy function addresses for SwapInterval. Given we don't really implement this funcitonality, this is a better fix.
2009-07-03wgl: Lookup framebuffers by HWND whenever possible.José Fonseca
Some applications create several HDCs for the same window, so spite the WGL API is geared towards HDCs it is not reliable searching by HDC.
2009-07-03radeon: Wait for BO idle if necessary before mapping it.Michel Dänzer
Fixes fighting between GPU and software rendering with TTM.
2009-07-03r300: Guard debugging output.Michel Dänzer
2009-07-02intel: Fall back on glBitmap with fog enabled.Eric Anholt
We would have to build the program with the appropriate fog mode, and also supply the fog coordinate if appropriate. Bug #19413.
2009-07-02intel: Flush when mapping buffer objects so writes don't get reordered.Eric Anholt
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.
2009-07-02vbo: If MapBufferRange fails, try MapBuffer instead.Corbin Simpson
Fixes segfaults with radeon winsys. (Probably libdrm_radeon doing something that it shouldn't.)
2009-07-02Nuke old trace-drm integration.Corbin Simpson
AFAICT nobody will miss it.
2009-07-02intel: Fix leak of DRI option info due to using the wrong free routine.Eric Anholt
2009-07-02intel: Clean up leak of driver context structure on context destroy.Eric Anholt
2009-07-02intel: Init num_fences to clean up valgrind warning.Eric Anholt
Valgrind doesn't know that a successful getparam sets the target of the pointer, so just set the value beforehand.
2009-07-02mesa: Assume depth textures have a single level unless told otherwise.José Fonseca
2009-07-02mesa: s/TRUE/GL_TRUEKeith Whitwell
Fix compile breakage on Linux.
2009-07-02r300g: Readd trace driver supportJakob Bornecrantz
2009-07-02i915g: Readd trace driver supportJakob Bornecrantz
2009-07-02trace: Add drm api integrationJakob Bornecrantz
This is okay since drm_api.h doesn't have any external dependancies, one could make it only compile on platforms that support drm.
2009-07-02glapi: ensure _mesa_lookup_prim_by_nr() is not clobbered on regenerationKeith Whitwell
Propogate changes to enums.c back up to the python source.
2009-07-02Merge commit 'origin/dlist-statechange-shortcircuit' into mesa_7_5_branchKeith Whitwell
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.
2009-07-02radeon/r200/r300: drop radeon renderbuffer private width/heightDave Airlie
half stealing the code without taking the intel regions
2009-07-02radeon/r300: use base width/height.Dave Airlie
I suspect this might break TFP in some way but it makes firecube run here
2009-07-02mesa: ensure UsesFogFragCoord value is set for non-glsl shadersKeith Whitwell
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.
2009-07-02i965: fixes for JMPIXiang, Haihao
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.
2009-07-01r300g: Fix recursive Draw flush.Corbin Simpson
Also just noticed that demos/copypix walks around the overlapping blit rules. Bad, bad Mesa. :3
2009-07-01r300g: Use floats for surface_copy texcoords, use correct src and dest.Corbin Simpson
This makes demos/copypix better-looking. Horizontal dimensions are right now.
2009-07-01radeon-gallium: Adapt to drm_api changes.Corbin Simpson
Note that trace debugging is temporarily gone. I'll rework it later.
2009-06-30intel: Avoid pointer arithmetic on void *.Eric Anholt
Bug #22000.
2009-06-30i965: Increase G4X default VS URB allocation to actually allow 32 threads.Eric Anholt
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.
2009-06-30demos: Set the depth mask correctly to get the desired blendingIan Romanick
2009-07-01nouveau: return some supported zeta formatsBen Skeggs
2009-07-01nouveau: deal with PIPE_CAP_TGSI_CONT_SUPPORTEDBen Skeggs
2009-07-01nouveau: fix build...Ben Skeggs
2009-07-01drm/st: Remove drm_api struct from driversJakob Bornecrantz
Remove the drm_api from the functions in the softpipe and i915simple drivers. Create wrapper functions in the backends instead.
2009-06-30i965: first attempt at handling URB overflow when there's too many vs outputsBrian Paul
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...
2009-06-30i965: use BRW_MAX_MRFBrian Paul
2009-06-30i965: use BRW_MAX_GRF, BRW_MAX_MRFBrian Paul
2009-06-30i965: move BRW_MAX_GRF, define BRW_MAX_MRFBrian Paul
2009-06-30i965: defined BRW_MAX_MRFBrian Paul
2009-06-30i965: comments and a new assertionBrian Paul
2009-06-30mesa/vbo: fix compile and replay of nodes ending in a FALLBACKKeith Whitwell
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.
2009-06-30i915: Fix assertion failure on remapping a non-BO-backed VBO.Eric Anholt
Failure to set the obj->Pointer back to null tripped up the assertion. Bug #22428.
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-30progs/trivial: add dlist-mat-tri.cKeith Whitwell
2009-06-30progs/trivial: add test case for short-circuiting material changesKeith Whitwell
Similar to dlist-tri-flat-tri, but using glMaterial calls, which have the extra property of being legal within Begin/End calls.
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-30progs/trivial: add dlist-flat-tri.cKeith Whitwell
State-change functions which precede the first call to glEnd() in a compiled list are vulnerable to not being executed when that list is called. In particular this can happen if a list is invoked from within a begin/end pair, as in this example.
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.