George Sapountzis [Fri, 6 Apr 2007 10:28:39 +0000 (13:28 +0300)]
xmesa: use newly added xm_image.[hc]
Keep external includes to glxheader.h and xmesa includes to xmesaP.h.
Drop the following from xm_image.h:
- dix-config.h (comes from glheader.h)
- xfree86 includes (come from GL/xmesa_xf86.h)
- ifdef __CYGWIN__ (leftover ? xm_api.c has something similar)
George Sapountzis [Fri, 6 Apr 2007 10:27:43 +0000 (13:27 +0300)]
xmesa: add xf86glx_util.[hc] from xserver as xm_image.[hc]
George Sapountzis [Fri, 6 Apr 2007 10:22:41 +0000 (13:22 +0300)]
Drop the funky SSE exception test on linux.
Replace the check for IN_DRI_DRIVER with the appropriate kernel version check
and just disable SSE on older (pre 2.4) kernels.
Brian [Fri, 6 Apr 2007 03:12:44 +0000 (21:12 -0600)]
fix color storage bug in convolution path
Brian [Thu, 5 Apr 2007 17:43:07 +0000 (11:43 -0600)]
include points.h to fix warnings
George Sapountzis [Thu, 5 Apr 2007 16:01:51 +0000 (19:01 +0300)]
Remove SI imports/exports remnants.
George Sapountzis [Thu, 5 Apr 2007 16:00:47 +0000 (19:00 +0300)]
glx: minor cosmetic in glcontextmodes.c
move memory macros to separate block and unwrap malloc/free for miniglx towards
cleaning Mesa core glitches in glx...
George Sapountzis [Thu, 5 Apr 2007 15:59:42 +0000 (18:59 +0300)]
Move glcontextmodes.c to glx.
It is no longer linked with DRI drivers, libGL passes function pointers through
the DRI interface.
Brian [Thu, 5 Apr 2007 15:28:09 +0000 (09:28 -0600)]
temporary add some extra renderbuffer debug code
Brian [Thu, 5 Apr 2007 04:18:53 +0000 (22:18 -0600)]
Remove the never-used SI-style imports/exports code.
Brian [Wed, 4 Apr 2007 15:33:12 +0000 (09:33 -0600)]
assorted updates
Brian [Wed, 4 Apr 2007 15:31:41 +0000 (09:31 -0600)]
assorted documentation updates
Brian [Wed, 4 Apr 2007 15:30:28 +0000 (09:30 -0600)]
init span.y=0 to silence warnings
Brian [Wed, 4 Apr 2007 14:48:06 +0000 (08:48 -0600)]
Overlapping copies with zoomZ=-1 were broken. See bug 10521.
Need to check for overlapping src/dest regions before computing bottom-to-top
vs. top-to-bottom order.
Brian [Wed, 4 Apr 2007 14:26:41 +0000 (08:26 -0600)]
remove debug printf
Xiang, Haihao [Wed, 4 Apr 2007 08:50:47 +0000 (16:50 +0800)]
i810/i915/i915tex: reinitialize the context point state
Nicolai Haehnle [Mon, 2 Apr 2007 18:59:51 +0000 (20:59 +0200)]
Fix in t_vp_build: Missed necessary updates sometimes
_mesa_update_state doesn't always reset VertexProgram._Current to NULL.
This caused us to skip a necessary update of the fixed function vertex
program sometimes.
Change the logic such that we check for updates whenever the _Current
program is either NULL or the program generated by t_vp_build.
Brian [Mon, 2 Apr 2007 16:03:34 +0000 (10:03 -0600)]
Call _glapi_set_context(NULL) in _glapi_check_multithread() to make sure the _glapi_Context global gets cleared properly.
Brian [Mon, 2 Apr 2007 15:56:28 +0000 (09:56 -0600)]
use _mesa_reference_renderbuffer() in a few more places
Brian [Mon, 2 Apr 2007 15:55:55 +0000 (09:55 -0600)]
updated debug printf
Brian [Mon, 2 Apr 2007 00:30:28 +0000 (18:30 -0600)]
Fix some bugs/issues related to alpha channel support. See bug 10483.
Brian [Mon, 2 Apr 2007 00:28:28 +0000 (18:28 -0600)]
If using PF_8A8B8G8R, be sure alpha is correctly handled.
Brian [Mon, 2 Apr 2007 00:27:23 +0000 (18:27 -0600)]
re-order tokens, fix comments
Brian [Sat, 31 Mar 2007 15:09:48 +0000 (09:09 -0600)]
always emit BGN/ENDSUB, for now anyway
Brian [Sat, 31 Mar 2007 15:09:21 +0000 (09:09 -0600)]
fix scoping mistake in previous commit that checked for writable LHSs
Brian [Fri, 30 Mar 2007 20:52:23 +0000 (14:52 -0600)]
check that LHS of assignment is writable
Eric Anholt [Fri, 30 Mar 2007 20:18:27 +0000 (13:18 -0700)]
Merge branch 'origin'
Eric Anholt [Fri, 30 Mar 2007 20:08:14 +0000 (13:08 -0700)]
Merge branch 'crestline-qa', adding support for the 965GM chipset.
Gustavo Pichorim Boiko [Fri, 30 Mar 2007 20:10:10 +0000 (14:10 -0600)]
call DRI_VALIDATE_DRAWABLE_INFO(), bug 10477
George Sapountzis [Wed, 6 Dec 2006 04:49:28 +0000 (06:49 +0200)]
Clean and update XMesa/XFree86 interface.
Drop XMesaSetVisualDisplay(), XMesaReset(), no longer used.
Add XMesaCopyContext() and move the GlxSetRenderTables() call for XGL within
XMesaForceCurrent(). This is to make xserver/GL/mesa/X/xf86glx.c unaware of
Mesa internals.
Also, clean some ifdef's to make it clear that USE_XSHM and XFree86Server are
mutually exclusive.
Lastly,
- move gcstruct.h from glxheader.h up to xmesa_xf86.h since it calls *gc->ops
- drop GL/glxtokens.h from xm_api|dd.c, GLX tokens come from glcore.h and are
used irrelevant of XFree86.
Brian [Wed, 28 Mar 2007 23:14:35 +0000 (17:14 -0600)]
more tips, validation info
Brian [Wed, 28 Mar 2007 23:08:17 +0000 (17:08 -0600)]
cond code fix
Brian [Wed, 28 Mar 2007 21:45:24 +0000 (15:45 -0600)]
fix cond code swizzle bug
Brian [Wed, 28 Mar 2007 21:16:33 +0000 (15:16 -0600)]
Handle logical NOT and XOR without library functions. Results in much tighter code.
Brian [Wed, 28 Mar 2007 20:49:33 +0000 (14:49 -0600)]
optimization for the emit_not() function
Brian [Wed, 28 Mar 2007 20:38:36 +0000 (14:38 -0600)]
remove IR_BREAK_IF_FALSE
Brian [Wed, 28 Mar 2007 20:33:25 +0000 (14:33 -0600)]
don't generate IR_BREAK_IF_FALSE
Brian [Wed, 28 Mar 2007 20:25:30 +0000 (14:25 -0600)]
Get rid of IR_CONT_IF_FALSE
Brian [Wed, 28 Mar 2007 20:23:33 +0000 (14:23 -0600)]
Get rid of BRK0, BRK1, CONT0, CONT1 instructions.
Brian [Wed, 28 Mar 2007 20:21:26 +0000 (14:21 -0600)]
Don't emit OPCODE_CONT0/1, BRK0/1 instructions, clean-ups elsewhere.
Brian [Wed, 28 Mar 2007 20:14:00 +0000 (14:14 -0600)]
simplify, clean-up break/cont code
Brian [Wed, 28 Mar 2007 19:29:57 +0000 (13:29 -0600)]
added some null ptr checks to handle error recovery
Brian [Wed, 28 Mar 2007 19:23:44 +0000 (13:23 -0600)]
Use constant_to_src_reg() to simplify some code
Brian [Wed, 28 Mar 2007 18:48:27 +0000 (12:48 -0600)]
added missing returns after slang_info_log_error() calls
Brian [Wed, 28 Mar 2007 17:06:34 +0000 (11:06 -0600)]
Fix, clean-up code related to comparisons, condition codes, etc.
Brian [Wed, 28 Mar 2007 17:01:28 +0000 (11:01 -0600)]
print condcodes if DEBUG_PROG
Brian [Wed, 28 Mar 2007 17:01:09 +0000 (11:01 -0600)]
expose _mesa_condcode_string(), fix some printing
Brian [Wed, 28 Mar 2007 16:44:38 +0000 (10:44 -0600)]
check that if/while/do-while condition is boolean or scalar
Brian [Wed, 28 Mar 2007 15:07:41 +0000 (09:07 -0600)]
bump version to 6.5.3 to match version.h
Alan Hourihane [Wed, 28 Mar 2007 14:58:08 +0000 (15:58 +0100)]
Add missing OSMesaColorClamp function
Brian [Tue, 27 Mar 2007 22:06:20 +0000 (16:06 -0600)]
disable MakeTexture()
Brian [Tue, 27 Mar 2007 22:05:25 +0000 (16:05 -0600)]
added ftransform() comment
Brian [Tue, 27 Mar 2007 22:04:36 +0000 (16:04 -0600)]
Implement true CAL/RET subroutines. Some optimizations, clean-ups coming...
Brian [Tue, 27 Mar 2007 21:21:35 +0000 (15:21 -0600)]
fix another pc off-by one
Brian [Tue, 27 Mar 2007 21:18:17 +0000 (15:18 -0600)]
added _slang_label_new_unique()
Brian [Tue, 27 Mar 2007 20:53:17 +0000 (14:53 -0600)]
fix some printing issues related to subroutines
Brian [Tue, 27 Mar 2007 20:02:04 +0000 (14:02 -0600)]
fix a fragment fog regression
Brian [Tue, 27 Mar 2007 17:02:20 +0000 (11:02 -0600)]
fix off by one error in OPCODE_RET
Brian [Tue, 27 Mar 2007 16:59:28 +0000 (10:59 -0600)]
init machine->StackDepth=0
Brian [Tue, 27 Mar 2007 16:36:06 +0000 (10:36 -0600)]
more parenthesis
Roland Scheidegger [Tue, 27 Mar 2007 20:57:22 +0000 (22:57 +0200)]
i915tex compile fix (account for moved _UseTexEnvProgram var)
Roland Scheidegger [Tue, 27 Mar 2007 19:03:32 +0000 (21:03 +0200)]
fix incorrect _MaxElement calculation
The calculation of _MaxElement was wrong if the stride was larger than
elementSize, which lead to rejection of every DrawElements call which accessed
the maximum element if CheckArrayBounds was enabled.
Roland Scheidegger [Tue, 27 Mar 2007 17:32:32 +0000 (19:32 +0200)]
recommit
e731d8aafa98bbf9d30f83e65f28b7718be55834.
This got lost with glsl-compiler-1 merge, it fixes segfaults when using
ATI_fragment_shader, which uses the ProgramStringNotify mechanism but doesn't
have a valid program pointer.
Brian [Tue, 27 Mar 2007 15:52:53 +0000 (09:52 -0600)]
add parenthesis around a bit-wise AND term in _tnl_InvalidateState()
Brian [Tue, 27 Mar 2007 15:51:52 +0000 (09:51 -0600)]
Restore the UseTexEnvProgram logic.
Was removed during glsl-compiler work. Still need to go back and revisit this
because of the interaction with fragment shaders...
Roland Scheidegger [Tue, 27 Mar 2007 14:27:34 +0000 (16:27 +0200)]
r300: Fix radeonUpdatePageFlipping() function.
Always call driFlipRenderbuffers() with pfCurrentPage value, in case it's
initially 1 instead of 0. May fix some issues with pageflip, the same fix was
applied to r128, radeon and r200 (
6e0e6eff05727ac8833c2b2dffc51c6619427e77).
Roland Scheidegger [Tue, 27 Mar 2007 14:22:00 +0000 (16:22 +0200)]
r128, radeon, r200: Check ctx->WinSysDrawBuffer before calling function that dereferences it.
Same fix as for r300 (which fixed https://bugs.freedesktop.org/show_bug.cgi?id=10417),
since it's likely an issue with those drivers too.
Bernardo Innocenti [Tue, 27 Mar 2007 14:05:33 +0000 (08:05 -0600)]
always print error messages, unless LIBGL_DEBUG=quiet
Brian [Tue, 27 Mar 2007 13:58:47 +0000 (07:58 -0600)]
simplify .a suffixing
Bernardo Innocenti [Tue, 27 Mar 2007 13:56:34 +0000 (07:56 -0600)]
remove static lib before building to make more bulletproof
Michel Dänzer [Tue, 27 Mar 2007 07:19:51 +0000 (09:19 +0200)]
r300: Check ctx->WinSysDrawBuffer before calling function that dereferences it.
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=10417 .
Miroslav Šustek [Tue, 27 Mar 2007 03:34:33 +0000 (23:34 -0400)]
fix r128 rendering, lockups
mis-count in offset led to mis-rendering and lockups;
units are 4 bytes rather than 1. Noticed by Chris Salch.
fixes bug 7994, possibly others.
Zou Nan hai [Tue, 27 Mar 2007 01:41:31 +0000 (09:41 +0800)]
Merge branch 'master' of git+ssh://znh@git.freedesktop.org/git/mesa/mesa
Zou Nan hai [Tue, 27 Mar 2007 01:41:01 +0000 (09:41 +0800)]
Fix compile error
Brian [Tue, 27 Mar 2007 00:47:19 +0000 (18:47 -0600)]
s/SUB/BGNSUB/
Brian [Tue, 27 Mar 2007 00:46:07 +0000 (18:46 -0600)]
Checkpoint: implementing true CAL/RET instructions for subroutine calls.
Also, found/fixed a code generation regression: the emit_swizzle() function
was always returning NULL. This caused emit_move() to miss its chance at peephole
optimization.
Brian [Mon, 26 Mar 2007 23:16:26 +0000 (17:16 -0600)]
Get rid of IR_JUMP and related code.
Brian [Mon, 26 Mar 2007 22:58:50 +0000 (16:58 -0600)]
special case RET
Brian [Mon, 26 Mar 2007 22:56:45 +0000 (16:56 -0600)]
Get rid of SLANG_OPER_GOTO, start rewrite of 'return' handling.
Brian [Mon, 26 Mar 2007 22:01:58 +0000 (16:01 -0600)]
remove debug abort() calls
Brian [Mon, 26 Mar 2007 21:46:35 +0000 (15:46 -0600)]
Additional error checking for 'return' statements.
Brian [Mon, 26 Mar 2007 21:09:59 +0000 (15:09 -0600)]
undo some debugging hacks
Brian [Mon, 26 Mar 2007 21:02:21 +0000 (15:02 -0600)]
dead code elimination for constant-valued if/then/else
Nicolai Haehnle [Mon, 26 Mar 2007 20:20:46 +0000 (22:20 +0200)]
r300: Remove a warning when vertex programs produce an unused output
As far as we know, the hardware prefers outputs packed tightly together
with no holes caused by outputs that are not even read by the fragment
program. Therefore, we slightly rewrite vertex programs in this case.
It would be interesting to test this interaction between vertex programs
and fragment programs further, because some of that rewrite may be
unnecessary. However, play it safe for now and don't change the current
behaviour.
Nicolai Haehnle [Mon, 26 Mar 2007 20:16:22 +0000 (22:16 +0200)]
r300: Whitespace cleanup (remove trailing spaces)
Brian [Mon, 26 Mar 2007 19:06:33 +0000 (13:06 -0600)]
Fix a few issues with computing storage sizes with respect to swizzles.
Brian [Mon, 26 Mar 2007 19:04:57 +0000 (13:04 -0600)]
In _mesa_lookup_parameter_constant() make sure we return a full, 4-component swizzle.
Nicolai Haehnle [Mon, 26 Mar 2007 19:41:17 +0000 (21:41 +0200)]
r300: Fix warnings that were introduced by the glsl merge
Brian [Mon, 26 Mar 2007 17:30:05 +0000 (11:30 -0600)]
Add _swrast_span_default_secondary_color() for use with glBitmap, glDrawPixels, etc.
Secondary color wasn't getting added to post-texture color when drawing
bitmaps, images. See bug 10409.
Brian [Mon, 26 Mar 2007 16:39:56 +0000 (10:39 -0600)]
remove incorrect assertions
Brian [Mon, 26 Mar 2007 16:23:50 +0000 (10:23 -0600)]
minor status updates
Brian [Mon, 26 Mar 2007 16:15:02 +0000 (10:15 -0600)]
disable printing shader program debug info
Brian [Mon, 26 Mar 2007 16:13:02 +0000 (10:13 -0600)]
merge of glsl-compiler-1 branch
Michel Dänzer [Mon, 26 Mar 2007 15:38:58 +0000 (17:38 +0200)]
i915tex: Make sure renderbuffers don't get deleted when flipping them.
Since the recent renderbuffer refcounting fixes it's no longer sufficient to
just remove the old renderbuffer from the framebuffer and then add the new one
because the former may decrease the reference count to 0 and delete the old
renderbuffer.
Brian [Mon, 26 Mar 2007 15:24:30 +0000 (09:24 -0600)]
disable free() until other issues can be fixed...
Brian [Mon, 26 Mar 2007 15:23:44 +0000 (09:23 -0600)]
fix mem leak, add comments
Ben Skeggs [Mon, 26 Mar 2007 11:31:43 +0000 (21:31 +1000)]
nouveau: match drm version bump
Nian Wu [Mon, 26 Mar 2007 09:00:29 +0000 (17:00 +0800)]
Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline
Brian [Sun, 25 Mar 2007 16:39:36 +0000 (10:39 -0600)]
Fix some renderbuffer reference counting issues. Also fixes a mem leak.
Brian [Sun, 25 Mar 2007 16:25:29 +0000 (10:25 -0600)]
destroy window on exit