mesa.git
17 years agoMAX_TEXTURE_COORDS_ARB and MAX_TEXTURE_IMAGE_UNITS_ARB had wrong glGet info.
Brian [Sun, 8 Apr 2007 02:38:25 +0000 (20:38 -0600)]
MAX_TEXTURE_COORDS_ARB and MAX_TEXTURE_IMAGE_UNITS_ARB had wrong glGet info.

Fixes bug 10371.

17 years agofix etags command to find headers
Brian [Sun, 8 Apr 2007 01:36:58 +0000 (19:36 -0600)]
fix etags command to find headers

17 years agoDrop XFree86Server from execmem.c
George Sapountzis [Sat, 7 Apr 2007 15:41:14 +0000 (18:41 +0300)]
Drop XFree86Server from execmem.c

This is a remnant from the libcwrapper days that can be removed now. It is the
last XFree86 glitch in Mesa core.

Reverts the following commit (thanks to Brian Paul for pointing to it):

commit 8b1dc68662f2a18ea4e02c6d3247c5d1da741aa8
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date:   Tue Jan 24 21:40:53 2006 +0000

    pull in fix from 6.4 branch for XFree86Server definition

commit cc7b6810e2fe6ab485fd96d5f17bf5d9329bd153
Author: Ian Romanick <idr@us.ibm.com>
Date:   Fri Oct 21 18:09:24 2005 +0000

    Make execmem.c compile in the server (libGLcore).  Since xf86mmap
    doesn't know about MAP_ANONYMOUS, this is the only viable fix.  This
    issue will likely have to be revisited at some point.

17 years agoset version for tarballs to 6.5.3pre for now
Richard Hughes [Sat, 7 Apr 2007 14:48:07 +0000 (08:48 -0600)]
set version for tarballs to 6.5.3pre for now

17 years agofix references to non-existant sz4 field
Richard Hughes [Sat, 7 Apr 2007 14:46:44 +0000 (08:46 -0600)]
fix references to non-existant sz4 field

17 years agofix some CHAN_TYPE==GL_FLOAT breakage
Richard Hughes [Sat, 7 Apr 2007 14:46:10 +0000 (08:46 -0600)]
fix some CHAN_TYPE==GL_FLOAT breakage

17 years agofix comment typo
Brian [Sat, 7 Apr 2007 14:43:40 +0000 (08:43 -0600)]
fix comment typo

17 years agoremove array_cache/, add vbo/
Richard Hughes [Sat, 7 Apr 2007 14:39:24 +0000 (08:39 -0600)]
remove array_cache/, add vbo/

17 years agoadded glActiveStencilFaceEXT
Brian [Sat, 7 Apr 2007 14:38:36 +0000 (08:38 -0600)]
added glActiveStencilFaceEXT

17 years agofor evaluators, loop to VBO_ATTRIB_TEX7, not VBO_ATTRIB_INDEX. See bug 10543
Brian [Fri, 6 Apr 2007 21:45:11 +0000 (15:45 -0600)]
for evaluators, loop to VBO_ATTRIB_TEX7, not VBO_ATTRIB_INDEX.  See bug 10543

17 years agoxmesa: use newly added xm_image.[hc]
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)

17 years agoxmesa: add xf86glx_util.[hc] from xserver as xm_image.[hc]
George Sapountzis [Fri, 6 Apr 2007 10:27:43 +0000 (13:27 +0300)]
xmesa: add xf86glx_util.[hc] from xserver as xm_image.[hc]

17 years agoDrop the funky SSE exception test on linux.
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.

17 years agofix color storage bug in convolution path
Brian [Fri, 6 Apr 2007 03:12:44 +0000 (21:12 -0600)]
fix color storage bug in convolution path

17 years agoinclude points.h to fix warnings
Brian [Thu, 5 Apr 2007 17:43:07 +0000 (11:43 -0600)]
include points.h to fix warnings

17 years agoRemove SI imports/exports remnants.
George Sapountzis [Thu, 5 Apr 2007 16:01:51 +0000 (19:01 +0300)]
Remove SI imports/exports remnants.

17 years agoglx: minor cosmetic in glcontextmodes.c
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...

17 years agoMove glcontextmodes.c to 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.

17 years agotemporary add some extra renderbuffer debug code
Brian [Thu, 5 Apr 2007 15:28:09 +0000 (09:28 -0600)]
temporary add some extra renderbuffer debug code

17 years agoRemove the never-used SI-style imports/exports code.
Brian [Thu, 5 Apr 2007 04:18:53 +0000 (22:18 -0600)]
Remove the never-used SI-style imports/exports code.

17 years agoassorted updates
Brian [Wed, 4 Apr 2007 15:33:12 +0000 (09:33 -0600)]
assorted updates

17 years agoassorted documentation updates
Brian [Wed, 4 Apr 2007 15:31:41 +0000 (09:31 -0600)]
assorted documentation updates

17 years agoinit span.y=0 to silence warnings
Brian [Wed, 4 Apr 2007 15:30:28 +0000 (09:30 -0600)]
init span.y=0 to silence warnings

17 years agoOverlapping copies with zoomZ=-1 were broken. See bug 10521.
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.

17 years agoremove debug printf
Brian [Wed, 4 Apr 2007 14:26:41 +0000 (08:26 -0600)]
remove debug printf

17 years agoi810/i915/i915tex: reinitialize the context point state
Xiang, Haihao [Wed, 4 Apr 2007 08:50:47 +0000 (16:50 +0800)]
i810/i915/i915tex: reinitialize the context point state

17 years agoFix in t_vp_build: Missed necessary updates sometimes
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.

17 years agoCall _glapi_set_context(NULL) in _glapi_check_multithread() to make sure the _glapi_C...
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.

17 years agouse _mesa_reference_renderbuffer() in a few more places
Brian [Mon, 2 Apr 2007 15:56:28 +0000 (09:56 -0600)]
use _mesa_reference_renderbuffer() in a few more places

17 years agoupdated debug printf
Brian [Mon, 2 Apr 2007 15:55:55 +0000 (09:55 -0600)]
updated debug printf

17 years agoFix some bugs/issues related to alpha channel support. See bug 10483.
Brian [Mon, 2 Apr 2007 00:30:28 +0000 (18:30 -0600)]
Fix some bugs/issues related to alpha channel support.  See bug 10483.

17 years agoIf using PF_8A8B8G8R, be sure alpha is correctly handled.
Brian [Mon, 2 Apr 2007 00:28:28 +0000 (18:28 -0600)]
If using PF_8A8B8G8R, be sure alpha is correctly handled.

17 years agore-order tokens, fix comments
Brian [Mon, 2 Apr 2007 00:27:23 +0000 (18:27 -0600)]
re-order tokens, fix comments

17 years agoalways emit BGN/ENDSUB, for now anyway
Brian [Sat, 31 Mar 2007 15:09:48 +0000 (09:09 -0600)]
always emit BGN/ENDSUB, for now anyway

17 years agofix scoping mistake in previous commit that checked for writable LHSs
Brian [Sat, 31 Mar 2007 15:09:21 +0000 (09:09 -0600)]
fix scoping mistake in previous commit that checked for writable LHSs

17 years agocheck that LHS of assignment is writable
Brian [Fri, 30 Mar 2007 20:52:23 +0000 (14:52 -0600)]
check that LHS of assignment is writable

17 years agoMerge branch 'origin'
Eric Anholt [Fri, 30 Mar 2007 20:18:27 +0000 (13:18 -0700)]
Merge branch 'origin'

17 years agoMerge branch 'crestline-qa', adding support for the 965GM chipset.
Eric Anholt [Fri, 30 Mar 2007 20:08:14 +0000 (13:08 -0700)]
Merge branch 'crestline-qa', adding support for the 965GM chipset.

17 years agocall DRI_VALIDATE_DRAWABLE_INFO(), bug 10477
Gustavo Pichorim Boiko [Fri, 30 Mar 2007 20:10:10 +0000 (14:10 -0600)]
call DRI_VALIDATE_DRAWABLE_INFO(), bug 10477

17 years agoClean and update XMesa/XFree86 interface.
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.

17 years agomore tips, validation info
Brian [Wed, 28 Mar 2007 23:14:35 +0000 (17:14 -0600)]
more tips, validation info

17 years agocond code fix
Brian [Wed, 28 Mar 2007 23:08:17 +0000 (17:08 -0600)]
cond code fix

17 years agofix cond code swizzle bug
Brian [Wed, 28 Mar 2007 21:45:24 +0000 (15:45 -0600)]
fix cond code swizzle bug

17 years agoHandle logical NOT and XOR without library functions. Results in much tighter code.
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.

17 years agooptimization for the emit_not() function
Brian [Wed, 28 Mar 2007 20:49:33 +0000 (14:49 -0600)]
optimization for the emit_not() function

17 years agoremove IR_BREAK_IF_FALSE
Brian [Wed, 28 Mar 2007 20:38:36 +0000 (14:38 -0600)]
remove IR_BREAK_IF_FALSE

17 years agodon't generate IR_BREAK_IF_FALSE
Brian [Wed, 28 Mar 2007 20:33:25 +0000 (14:33 -0600)]
don't generate IR_BREAK_IF_FALSE

17 years agoGet rid of IR_CONT_IF_FALSE
Brian [Wed, 28 Mar 2007 20:25:30 +0000 (14:25 -0600)]
Get rid of IR_CONT_IF_FALSE

17 years agoGet rid of BRK0, BRK1, CONT0, CONT1 instructions.
Brian [Wed, 28 Mar 2007 20:23:33 +0000 (14:23 -0600)]
Get rid of BRK0, BRK1, CONT0, CONT1 instructions.

17 years agoDon't emit OPCODE_CONT0/1, BRK0/1 instructions, clean-ups elsewhere.
Brian [Wed, 28 Mar 2007 20:21:26 +0000 (14:21 -0600)]
Don't emit OPCODE_CONT0/1, BRK0/1 instructions, clean-ups elsewhere.

17 years agosimplify, clean-up break/cont code
Brian [Wed, 28 Mar 2007 20:14:00 +0000 (14:14 -0600)]
simplify, clean-up break/cont code

17 years agoadded some null ptr checks to handle error recovery
Brian [Wed, 28 Mar 2007 19:29:57 +0000 (13:29 -0600)]
added some null ptr checks to handle error recovery

17 years agoUse constant_to_src_reg() to simplify some code
Brian [Wed, 28 Mar 2007 19:23:44 +0000 (13:23 -0600)]
Use constant_to_src_reg() to simplify some code

17 years agoadded missing returns after slang_info_log_error() calls
Brian [Wed, 28 Mar 2007 18:48:27 +0000 (12:48 -0600)]
added missing returns after slang_info_log_error() calls

17 years agoFix, clean-up code related to comparisons, condition codes, etc.
Brian [Wed, 28 Mar 2007 17:06:34 +0000 (11:06 -0600)]
Fix, clean-up code related to comparisons, condition codes, etc.

17 years agoprint condcodes if DEBUG_PROG
Brian [Wed, 28 Mar 2007 17:01:28 +0000 (11:01 -0600)]
print condcodes if DEBUG_PROG

17 years agoexpose _mesa_condcode_string(), fix some printing
Brian [Wed, 28 Mar 2007 17:01:09 +0000 (11:01 -0600)]
expose _mesa_condcode_string(), fix some printing

17 years agocheck that if/while/do-while condition is boolean or scalar
Brian [Wed, 28 Mar 2007 16:44:38 +0000 (10:44 -0600)]
check that if/while/do-while condition is boolean or scalar

17 years agobump version to 6.5.3 to match version.h
Brian [Wed, 28 Mar 2007 15:07:41 +0000 (09:07 -0600)]
bump version to 6.5.3 to match version.h

17 years agoAdd missing OSMesaColorClamp function
Alan Hourihane [Wed, 28 Mar 2007 14:58:08 +0000 (15:58 +0100)]
Add missing OSMesaColorClamp function

17 years agodisable MakeTexture()
Brian [Tue, 27 Mar 2007 22:06:20 +0000 (16:06 -0600)]
disable MakeTexture()

17 years agoadded ftransform() comment
Brian [Tue, 27 Mar 2007 22:05:25 +0000 (16:05 -0600)]
added ftransform() comment

17 years agoImplement true CAL/RET subroutines. Some optimizations, clean-ups coming...
Brian [Tue, 27 Mar 2007 22:04:36 +0000 (16:04 -0600)]
Implement true CAL/RET subroutines. Some optimizations, clean-ups coming...

17 years agofix another pc off-by one
Brian [Tue, 27 Mar 2007 21:21:35 +0000 (15:21 -0600)]
fix another pc off-by one

17 years agoadded _slang_label_new_unique()
Brian [Tue, 27 Mar 2007 21:18:17 +0000 (15:18 -0600)]
added _slang_label_new_unique()

17 years agofix some printing issues related to subroutines
Brian [Tue, 27 Mar 2007 20:53:17 +0000 (14:53 -0600)]
fix some printing issues related to subroutines

17 years agofix a fragment fog regression
Brian [Tue, 27 Mar 2007 20:02:04 +0000 (14:02 -0600)]
fix a fragment fog regression

17 years agofix off by one error in OPCODE_RET
Brian [Tue, 27 Mar 2007 17:02:20 +0000 (11:02 -0600)]
fix off by one error in OPCODE_RET

17 years agoinit machine->StackDepth=0
Brian [Tue, 27 Mar 2007 16:59:28 +0000 (10:59 -0600)]
init machine->StackDepth=0

17 years agomore parenthesis
Brian [Tue, 27 Mar 2007 16:36:06 +0000 (10:36 -0600)]
more parenthesis

17 years agoi915tex compile fix (account for moved _UseTexEnvProgram var)
Roland Scheidegger [Tue, 27 Mar 2007 20:57:22 +0000 (22:57 +0200)]
i915tex compile fix (account for moved _UseTexEnvProgram var)

17 years agofix incorrect _MaxElement calculation
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.

17 years agorecommit e731d8aafa98bbf9d30f83e65f28b7718be55834.
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.

17 years agoadd parenthesis around a bit-wise AND term in _tnl_InvalidateState()
Brian [Tue, 27 Mar 2007 15:52:53 +0000 (09:52 -0600)]
add parenthesis around a bit-wise AND term in _tnl_InvalidateState()

17 years agoRestore the UseTexEnvProgram logic.
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...

17 years agor300: Fix radeonUpdatePageFlipping() function.
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).

17 years agor128, radeon, r200: Check ctx->WinSysDrawBuffer before calling function that derefere...
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.

17 years agoalways print error messages, unless LIBGL_DEBUG=quiet
Bernardo Innocenti [Tue, 27 Mar 2007 14:05:33 +0000 (08:05 -0600)]
always print error messages, unless LIBGL_DEBUG=quiet

17 years agosimplify .a suffixing
Brian [Tue, 27 Mar 2007 13:58:47 +0000 (07:58 -0600)]
simplify .a suffixing

17 years agoremove static lib before building to make more bulletproof
Bernardo Innocenti [Tue, 27 Mar 2007 13:56:34 +0000 (07:56 -0600)]
remove static lib before building to make more bulletproof

17 years agor300: Check ctx->WinSysDrawBuffer before calling function that dereferences it.
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 .

17 years agofix r128 rendering, lockups
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.

17 years agoMerge branch 'master' of git+ssh://znh@git.freedesktop.org/git/mesa/mesa
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

17 years ago Fix compile error
Zou Nan hai [Tue, 27 Mar 2007 01:41:01 +0000 (09:41 +0800)]
  Fix compile error

17 years agos/SUB/BGNSUB/
Brian [Tue, 27 Mar 2007 00:47:19 +0000 (18:47 -0600)]
s/SUB/BGNSUB/

17 years agoCheckpoint: implementing true CAL/RET instructions for subroutine calls.
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.

17 years agoGet rid of IR_JUMP and related code.
Brian [Mon, 26 Mar 2007 23:16:26 +0000 (17:16 -0600)]
Get rid of IR_JUMP and related code.

17 years agospecial case RET
Brian [Mon, 26 Mar 2007 22:58:50 +0000 (16:58 -0600)]
special case RET

17 years agoGet rid of SLANG_OPER_GOTO, start rewrite of 'return' handling.
Brian [Mon, 26 Mar 2007 22:56:45 +0000 (16:56 -0600)]
Get rid of SLANG_OPER_GOTO, start rewrite of 'return' handling.

17 years agoremove debug abort() calls
Brian [Mon, 26 Mar 2007 22:01:58 +0000 (16:01 -0600)]
remove debug abort() calls

17 years agoAdditional error checking for 'return' statements.
Brian [Mon, 26 Mar 2007 21:46:35 +0000 (15:46 -0600)]
Additional error checking for 'return' statements.

17 years agoundo some debugging hacks
Brian [Mon, 26 Mar 2007 21:09:59 +0000 (15:09 -0600)]
undo some debugging hacks

17 years agodead code elimination for constant-valued if/then/else
Brian [Mon, 26 Mar 2007 21:02:21 +0000 (15:02 -0600)]
dead code elimination for constant-valued if/then/else

17 years agor300: Remove a warning when vertex programs produce an unused output
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.

17 years agor300: Whitespace cleanup (remove trailing spaces)
Nicolai Haehnle [Mon, 26 Mar 2007 20:16:22 +0000 (22:16 +0200)]
r300: Whitespace cleanup (remove trailing spaces)

17 years agoFix a few issues with computing storage sizes with respect to swizzles.
Brian [Mon, 26 Mar 2007 19:06:33 +0000 (13:06 -0600)]
Fix a few issues with computing storage sizes with respect to swizzles.

17 years agoIn _mesa_lookup_parameter_constant() make sure we return a full, 4-component swizzle.
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.

17 years agor300: Fix warnings that were introduced by the glsl merge
Nicolai Haehnle [Mon, 26 Mar 2007 19:41:17 +0000 (21:41 +0200)]
r300: Fix warnings that were introduced by the glsl merge

17 years agoAdd _swrast_span_default_secondary_color() for use with glBitmap, glDrawPixels, etc.
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.

17 years agoremove incorrect assertions
Brian [Mon, 26 Mar 2007 16:39:56 +0000 (10:39 -0600)]
remove incorrect assertions