mesa.git
15 years agowgl: Combine alpha pixelformat info in color.
José Fonseca [Fri, 10 Apr 2009 09:14:13 +0000 (10:14 +0100)]
wgl: Combine alpha pixelformat info in color.

15 years agostw: Reorder the pixelformats, so that no alpha pixelformats get chosen before alpha.
José Fonseca [Fri, 10 Apr 2009 09:04:31 +0000 (10:04 +0100)]
stw: Reorder the pixelformats, so that no alpha pixelformats get chosen before alpha.

Some applications might not handle a alpha visual when when they did not
request for one.

15 years agostw: Don't make assumptions about integer size.
José Fonseca [Fri, 10 Apr 2009 09:02:58 +0000 (10:02 +0100)]
stw: Don't make assumptions about integer size.

15 years agostw: Free the mesa framebuffer.
José Fonseca [Fri, 10 Apr 2009 09:02:29 +0000 (10:02 +0100)]
stw: Free the mesa framebuffer.

15 years agotgsi/sse2: Cleanup NRM/NRM4 implementation.
Michal Krol [Fri, 10 Apr 2009 09:58:49 +0000 (11:58 +0200)]
tgsi/sse2: Cleanup NRM/NRM4 implementation.

Fix comments.
Make sure .w is set to 1.0 for NRM.
Optimise for non-.xyzw writemasks.

15 years agortasm: Silence `static function not used' warning.
Michal Krol [Fri, 10 Apr 2009 07:00:57 +0000 (09:00 +0200)]
rtasm: Silence `static function not used' warning.

15 years agodraw: Silence pointer-to-integer cast warning.
Michal Krol [Fri, 10 Apr 2009 06:59:20 +0000 (08:59 +0200)]
draw: Silence pointer-to-integer cast warning.

15 years agodraw: Fix vertex_header initialisation.
Michal Krol [Fri, 10 Apr 2009 06:54:47 +0000 (08:54 +0200)]
draw: Fix vertex_header initialisation.

15 years agoswrast: remove some unneeded CHAN_TYPE!=GL_FLOAT code
Brian Paul [Thu, 9 Apr 2009 21:31:48 +0000 (15:31 -0600)]
swrast: remove some unneeded CHAN_TYPE!=GL_FLOAT code

15 years agogallium: comments for surface_copy(), surface_fill() in p_context.h
Brian Paul [Fri, 10 Apr 2009 00:40:24 +0000 (18:40 -0600)]
gallium: comments for surface_copy(), surface_fill() in p_context.h

15 years agoi965: re-org of some of the new constant buffer code
Brian Paul [Fri, 10 Apr 2009 00:37:03 +0000 (18:37 -0600)]
i965: re-org of some of the new constant buffer code

Plus, begin the new code for vertex shader const buffers.

15 years agodemos: fix aspect ratio in Reshape()
Brian Paul [Thu, 9 Apr 2009 23:04:58 +0000 (17:04 -0600)]
demos: fix aspect ratio in Reshape()

15 years agoi965: new SURF_INDEX_ macros
Brian Paul [Thu, 9 Apr 2009 23:04:09 +0000 (17:04 -0600)]
i965: new SURF_INDEX_ macros

Used to map drawables, textures and constant buffers to surface binding
table indexes.

15 years agogallium: change // comment to /* */ style
Brian Paul [Thu, 9 Apr 2009 22:10:43 +0000 (16:10 -0600)]
gallium: change // comment to /* */ style

15 years agogallium: updated comments in p_screen.h
Brian Paul [Thu, 9 Apr 2009 22:02:41 +0000 (16:02 -0600)]
gallium: updated comments in p_screen.h

15 years agoi965simple: remove pipe_texture::compressed reference
Brian Paul [Thu, 9 Apr 2009 21:09:42 +0000 (15:09 -0600)]
i965simple: remove pipe_texture::compressed reference

15 years agotgsi/sse2: Fix build.
Michal Krol [Thu, 9 Apr 2009 21:24:57 +0000 (23:24 +0200)]
tgsi/sse2: Fix build.

15 years agodraw: Fix LIT instruction.
Michal Krol [Thu, 9 Apr 2009 21:17:02 +0000 (23:17 +0200)]
draw: Fix LIT instruction.

15 years agointel / DRI2: Accept fake front-buffer from loader
Ian Romanick [Tue, 7 Apr 2009 18:23:10 +0000 (11:23 -0700)]
intel / DRI2: Accept fake front-buffer from loader

Handle the loader returning a fake front-buffer.  Since the driver
never specifically requests a fake front-buffer, the driver assumes
that it will never receive both a fake and a real front-buffer.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kristian Høgsberg <krh@redhat.com>
15 years agoDRI2: Assume that there is always a front buffer
Ian Romanick [Mon, 6 Apr 2009 22:35:37 +0000 (15:35 -0700)]
DRI2: Assume that there is always a front buffer

Assume that the front-buffer exists even if the server didn't tell the
client that it exists.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kristian Høgsberg <krh@redhat.com>
15 years agointel / DRI2: Track and flush front-buffer rendering
Ian Romanick [Mon, 6 Apr 2009 20:15:54 +0000 (13:15 -0700)]
intel / DRI2: Track and flush front-buffer rendering

Track two flags:  whether or not front-buffer rendering is currently
enabled and whether or not front-buffer rendering has been enabled
since the last glFlush.  If the second flag is set, the front-buffer
is flushed via a loader call back.  If the first flag is cleared, the
second flag is cleared at this time.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kristian Høgsberg <krh@redhat.com>
15 years agoDRI2: Provide an interface for drivers to flush front-buffer rendering
Ian Romanick [Mon, 6 Apr 2009 19:44:18 +0000 (12:44 -0700)]
DRI2: Provide an interface for drivers to flush front-buffer rendering

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kristian Høgsberg <krh@redhat.com>
15 years agopython: Fix bad pointer.
José Fonseca [Thu, 9 Apr 2009 21:10:45 +0000 (22:10 +0100)]
python: Fix bad pointer.

15 years agost: remove another unneeded 'is compressed' comparison
Brian Paul [Thu, 9 Apr 2009 21:00:54 +0000 (15:00 -0600)]
st: remove another unneeded 'is compressed' comparison

15 years agost: remove unneeded "is compressed" check
Brian Paul [Thu, 9 Apr 2009 20:58:40 +0000 (14:58 -0600)]
st: remove unneeded "is compressed" check

The format indicates compressed vs. uncompressed.

15 years agost: rearrange some code to be a little more clear
Brian Paul [Thu, 9 Apr 2009 20:57:41 +0000 (14:57 -0600)]
st: rearrange some code to be a little more clear

15 years agogallium: remove unneeded compressed=0 assignment
Brian Paul [Thu, 9 Apr 2009 20:55:32 +0000 (14:55 -0600)]
gallium: remove unneeded compressed=0 assignment

15 years agogallium: remove unneeded compressed=0 assignment
Brian Paul [Thu, 9 Apr 2009 20:55:19 +0000 (14:55 -0600)]
gallium: remove unneeded compressed=0 assignment

15 years agost: remove comp_byte parameter to st_texture_create()
Brian Paul [Thu, 9 Apr 2009 20:48:21 +0000 (14:48 -0600)]
st: remove comp_byte parameter to st_texture_create()

We can determine if the texture is compressed by checking the format.

15 years agost: consolidate format->usage computation
Brian Paul [Thu, 9 Apr 2009 20:41:49 +0000 (14:41 -0600)]
st: consolidate format->usage computation

15 years agost: add const qualifiers, use GL types
Brian Paul [Thu, 9 Apr 2009 20:35:36 +0000 (14:35 -0600)]
st: add const qualifiers, use GL types

15 years agost: make loops over 3D texture slices a litte more intuitive
Brian Paul [Thu, 9 Apr 2009 20:32:42 +0000 (14:32 -0600)]
st: make loops over 3D texture slices a litte more intuitive

15 years agost: reformatting and clean-ups in texture code
Brian Paul [Thu, 9 Apr 2009 20:27:36 +0000 (14:27 -0600)]
st: reformatting and clean-ups in texture code

15 years agotgsi/sse2: Fix ARL instruction.
Michal Krol [Thu, 9 Apr 2009 20:47:06 +0000 (22:47 +0200)]
tgsi/sse2: Fix ARL instruction.

15 years agotgsi/sse2: Fix LIT instruction.
Michal Krol [Thu, 9 Apr 2009 20:38:07 +0000 (22:38 +0200)]
tgsi/sse2: Fix LIT instruction.

15 years agotrace: Dump the fence, not its pointer.
José Fonseca [Thu, 9 Apr 2009 20:28:31 +0000 (21:28 +0100)]
trace: Dump the fence, not its pointer.

15 years agowgl: Remove unused member.
José Fonseca [Thu, 9 Apr 2009 20:27:43 +0000 (21:27 +0100)]
wgl: Remove unused member.

15 years agotrace: Use 'flags' name consistently.
José Fonseca [Thu, 9 Apr 2009 20:27:03 +0000 (21:27 +0100)]
trace: Use 'flags' name consistently.

15 years agogallium: Use "flags" consistently.
José Fonseca [Thu, 9 Apr 2009 20:26:15 +0000 (21:26 +0100)]
gallium: Use "flags" consistently.

15 years agogdi: Use stw_* names.
José Fonseca [Thu, 9 Apr 2009 19:42:09 +0000 (20:42 +0100)]
gdi: Use stw_* names.

15 years agowgl: Use more stw_* names.
José Fonseca [Thu, 9 Apr 2009 19:41:59 +0000 (20:41 +0100)]
wgl: Use more stw_* names.

15 years agowgl: Use hooks instead of subclassing the window.
José Fonseca [Thu, 9 Apr 2009 19:35:55 +0000 (20:35 +0100)]
wgl: Use hooks instead of subclassing the window.

Subclassing the window is invasive: we might call an old window proc even
after it was removed. Glut and another bug just in the wrong time was
provoking this. Hooks don't have this problem.

15 years agomesa: fix potential recursive locking deadlock in _mesa_HashWalk()
Brian Paul [Thu, 9 Apr 2009 16:53:01 +0000 (10:53 -0600)]
mesa: fix potential recursive locking deadlock in _mesa_HashWalk()

If the walk callback called _mesa_HashRemove() we'd deadlock.

15 years agoi965: free shader's constant buffer in brwDeleteProgram()
Brian Paul [Thu, 9 Apr 2009 16:33:08 +0000 (10:33 -0600)]
i965: free shader's constant buffer in brwDeleteProgram()

Fixes mem leak observed with texcombine test.

15 years agowgl: Catch the attempt of releasing a context which is not current.
José Fonseca [Thu, 9 Apr 2009 14:15:12 +0000 (15:15 +0100)]
wgl: Catch the attempt of releasing a context which is not current.

15 years agowgl: Move the framebuffer list to the device. Avoid recursive locking.
José Fonseca [Thu, 9 Apr 2009 13:58:17 +0000 (14:58 +0100)]
wgl: Move the framebuffer list to the device. Avoid recursive locking.

15 years agowgl: More symbol naming normalization.
José Fonseca [Thu, 9 Apr 2009 10:44:33 +0000 (11:44 +0100)]
wgl: More symbol naming normalization.

15 years agostw: Use wglext.h's defines and prototypes.
José Fonseca [Thu, 9 Apr 2009 10:28:23 +0000 (11:28 +0100)]
stw: Use wglext.h's defines and prototypes.

15 years agostw: Normalize symbols prefix.
José Fonseca [Thu, 9 Apr 2009 10:09:42 +0000 (11:09 +0100)]
stw: Normalize symbols prefix.

15 years agowgl: Add const qualifier to global constant data.
José Fonseca [Thu, 9 Apr 2009 09:54:00 +0000 (10:54 +0100)]
wgl: Add const qualifier to global constant data.

15 years agoi965: set BRW_MASK_DISABLE flag in "send" instruction in brw_dp_READ_4()
Brian Paul [Thu, 9 Apr 2009 01:35:24 +0000 (19:35 -0600)]
i965: set BRW_MASK_DISABLE flag in "send" instruction in brw_dp_READ_4()

This fixes the random results that were seen when fetching a constant
inside an IF/ELSE clause.  Disabling the execution mask ensures that all
the components of the register are written.

15 years agoi965: clean-ups, debug code in brw_wm_glsl.c
Brian Paul [Thu, 9 Apr 2009 01:31:49 +0000 (19:31 -0600)]
i965: clean-ups, debug code in brw_wm_glsl.c

15 years agoi965: init current_const[i].index = -1
Brian Paul [Thu, 9 Apr 2009 01:29:37 +0000 (19:29 -0600)]
i965: init current_const[i].index = -1

15 years agoi965: move the fetch_constants() call before setting conditional mod state
Brian Paul [Wed, 8 Apr 2009 19:48:34 +0000 (13:48 -0600)]
i965: move the fetch_constants() call before setting conditional mod state

Before, the instruction's CondUpdate field was mistakenly effecting the
constant-fetch operation.

Fixes progs/glsl/bump.c demo.  But there are some other issues related
to condition flags and IF/ELSE that need investigation...

15 years agomesa: minor datatype changes in optimization code
Brian Paul [Tue, 7 Apr 2009 17:15:27 +0000 (11:15 -0600)]
mesa: minor datatype changes in optimization code

15 years agonv50: adapt for new clear interface
Ben Skeggs [Thu, 9 Apr 2009 01:36:28 +0000 (11:36 +1000)]
nv50: adapt for new clear interface

this is so much nicer :)

15 years agor300-gallium: Properly emit indexbufs.
Corbin Simpson [Wed, 8 Apr 2009 21:54:17 +0000 (14:54 -0700)]
r300-gallium: Properly emit indexbufs.

This fixes hardlocks with anything using elts.

15 years agor300-gallium: Add vertex shader constant emit.
Corbin Simpson [Tue, 7 Apr 2009 09:04:07 +0000 (02:04 -0700)]
r300-gallium: Add vertex shader constant emit.

15 years agopython/retrace: Try to cope with failures creating textures.
José Fonseca [Wed, 8 Apr 2009 20:13:57 +0000 (21:13 +0100)]
python/retrace: Try to cope with failures creating textures.

15 years agopython: Don't try to finish a null fence.
José Fonseca [Wed, 8 Apr 2009 20:11:51 +0000 (21:11 +0100)]
python: Don't try to finish a null fence.

15 years agopython/retrace: Use colors on windows console.
José Fonseca [Wed, 8 Apr 2009 20:11:24 +0000 (21:11 +0100)]
python/retrace: Use colors on windows console.

15 years agoMesa: allow suppression of debug messages in a debug build
Robert Ellison [Wed, 8 Apr 2009 16:58:33 +0000 (10:58 -0600)]
Mesa: allow suppression of debug messages in a debug build

For testing, it's very useful to be able to test on a debug build,
while suppressing the debug messages (messages that are by default
suppressed in a release build), in order to see the same behavior
that users of release builds will see.

For example, the "piglit" test suite will flag an error on
programs that produce unexpected output, which means that a
debug build will always fail due to the extra debug messages.

This change introduces a new value to the MESA_DEBUG
environment variable.  In a debug build, explicitly setting MESA_DEBUG
to "0" will suppress all debug messages (both from _mesa_debug() and
from _mesa_warning()).  (The former behavior was that debug
messages were never suppressed in debug builds.)

Behavior of non-debug builds has not changed.  In such a build,
_mesa_debug() messages are always suppressed, and _mesa_warning()
messages will be suppressed unless MESA_DEBUG is set *to any value*.

15 years agogallium: when using gl_PointCoord ensure we use the correct attribute.
Alan Hourihane [Wed, 8 Apr 2009 15:39:17 +0000 (16:39 +0100)]
gallium: when using gl_PointCoord ensure we use the correct attribute.

15 years agopython/retrace: Allow to specify the range of calls of interest.
José Fonseca [Wed, 8 Apr 2009 15:25:29 +0000 (16:25 +0100)]
python/retrace: Allow to specify the range of calls of interest.

15 years agotrace: Make calls dumping threadsafe.
José Fonseca [Wed, 8 Apr 2009 15:24:31 +0000 (16:24 +0100)]
trace: Make calls dumping threadsafe.

15 years agotrace: Make call no global.
José Fonseca [Wed, 8 Apr 2009 14:41:08 +0000 (15:41 +0100)]
trace: Make call no global.

15 years agopython/retrace: Handle recent traces.
José Fonseca [Wed, 8 Apr 2009 14:36:17 +0000 (15:36 +0100)]
python/retrace: Handle recent traces.

Try to keep backwards compatability with old traces as much as possible.

15 years agopython: Fix method renaming.
José Fonseca [Wed, 8 Apr 2009 14:32:08 +0000 (15:32 +0100)]
python: Fix method renaming.

15 years agopython: Cope with null surfaces.
José Fonseca [Wed, 8 Apr 2009 14:30:53 +0000 (15:30 +0100)]
python: Cope with null surfaces.

15 years agowgl: Integrate the trace driver on debug builds.
José Fonseca [Wed, 8 Apr 2009 14:30:31 +0000 (15:30 +0100)]
wgl: Integrate the trace driver on debug builds.

15 years agotrace: Simplify cast wrappers.
José Fonseca [Wed, 8 Apr 2009 14:29:50 +0000 (15:29 +0100)]
trace: Simplify cast wrappers.

15 years agotrace: Match pipe_context::clear prototype.
José Fonseca [Wed, 8 Apr 2009 14:23:48 +0000 (15:23 +0100)]
trace: Match pipe_context::clear prototype.

15 years agogallium: handle the case of util_pack_z_stencil(format=PIPE_FORMAT_S8_UNORM)
Brian Paul [Wed, 8 Apr 2009 14:23:01 +0000 (08:23 -0600)]
gallium: handle the case of util_pack_z_stencil(format=PIPE_FORMAT_S8_UNORM)

Fixes failed assertion in glean fbo test.

15 years agodocs: bump Gallium version number
Brian Paul [Wed, 8 Apr 2009 00:26:45 +0000 (18:26 -0600)]
docs: bump Gallium version number

15 years agodocs: updated Cell driver info
Brian Paul [Wed, 8 Apr 2009 00:26:08 +0000 (18:26 -0600)]
docs: updated Cell driver info

15 years agodocs: more info for 7.4 release notes
Brian Paul [Wed, 8 Apr 2009 00:23:21 +0000 (18:23 -0600)]
docs: more info for 7.4 release notes

15 years agomesa: Don't attempt to free the dummy program.
José Fonseca [Wed, 8 Apr 2009 10:32:43 +0000 (11:32 +0100)]
mesa: Don't attempt to free the dummy program.

15 years agost: implement glCopyTexImage() for GL_DEPTH24_STENCIL8 internal format
Brian Paul [Tue, 7 Apr 2009 23:56:40 +0000 (17:56 -0600)]
st: implement glCopyTexImage() for GL_DEPTH24_STENCIL8 internal format

15 years agost: implement GL_DEPTH_STENCIL format for glReadPixels and DrawPixels()
Brian Paul [Tue, 7 Apr 2009 23:32:29 +0000 (17:32 -0600)]
st: implement GL_DEPTH_STENCIL format for glReadPixels and DrawPixels()

15 years agosoftpipe: minor debug-help changes in softpipe_transfer_map()
Brian Paul [Tue, 7 Apr 2009 23:31:49 +0000 (17:31 -0600)]
softpipe: minor debug-help changes in softpipe_transfer_map()

15 years agomesa: add another special/optimized case in _mesa_unpack_depth_span()
Brian Paul [Tue, 7 Apr 2009 23:31:14 +0000 (17:31 -0600)]
mesa: add another special/optimized case in _mesa_unpack_depth_span()

15 years agoswrast: fix point rendering function selection
Brian Paul [Tue, 7 Apr 2009 19:28:10 +0000 (13:28 -0600)]
swrast: fix point rendering function selection

Need to clamp default point size to min/max range before checking if it's one.
Fixes glean pointAtten test.

15 years agomesa: fix incorrect component ordering for sRGB8 texture fetch/store
Brian Paul [Tue, 7 Apr 2009 19:17:42 +0000 (13:17 -0600)]
mesa: fix incorrect component ordering for sRGB8 texture fetch/store

This format is layered on MESA_FORMAT_RGB888 so the component order is
actually BGR.
Fixes glean pixelFormat failures.

15 years agoglsl: enable the new linear scan register allocator code
Brian Paul [Tue, 7 Apr 2009 17:10:27 +0000 (11:10 -0600)]
glsl: enable the new linear scan register allocator code

Seems to b working well enough to enable all the time.
Optimizations can be disabled with "export MESA_GLSL=nopt" if needed.

15 years agodocs: document the MESA_GLSL env var, other misc GLSL updates
Brian Paul [Tue, 7 Apr 2009 17:09:53 +0000 (11:09 -0600)]
docs: document the MESA_GLSL env var, other misc GLSL updates

15 years agoglsl: don't optimize program if MESA_GLSL=nopt
Brian Paul [Tue, 7 Apr 2009 17:01:15 +0000 (11:01 -0600)]
glsl: don't optimize program if MESA_GLSL=nopt

15 years agoswrast: restore !shader check around add_specular()
Brian Paul [Tue, 7 Apr 2009 13:04:14 +0000 (07:04 -0600)]
swrast: restore !shader check around add_specular()

Fixes a regression from commit 76ac75af8e5481b498981c133836efa2101be2dc.

15 years agor300-gallium: vs: Add MAD.
Corbin Simpson [Tue, 7 Apr 2009 06:36:34 +0000 (23:36 -0700)]
r300-gallium: vs: Add MAD.

15 years agor300-gallium: vs: Add MUL.
Corbin Simpson [Tue, 7 Apr 2009 06:26:38 +0000 (23:26 -0700)]
r300-gallium: vs: Add MUL.

15 years agor300-gallium: Fix surface_copy too.
Corbin Simpson [Tue, 7 Apr 2009 06:25:27 +0000 (23:25 -0700)]
r300-gallium: Fix surface_copy too.

15 years agor300-gallium: Properly setup HW/SW TCL controls.
Corbin Simpson [Tue, 7 Apr 2009 06:17:33 +0000 (23:17 -0700)]
r300-gallium: Properly setup HW/SW TCL controls.

This keeps non-TCL chipsets from locking up, and also fully unbreaks
RADEON_NO_TCL rendering.

15 years agoswrast: more texcombine clean-ups
Brian Paul [Tue, 7 Apr 2009 03:37:20 +0000 (21:37 -0600)]
swrast: more texcombine clean-ups

15 years agoswrast: asst. clean-ups in texcombine code
Brian Paul [Tue, 7 Apr 2009 02:08:43 +0000 (20:08 -0600)]
swrast: asst. clean-ups in texcombine code

15 years agoswrast: fix secondary color add for glBitmap
Brian Paul [Mon, 6 Apr 2009 23:17:52 +0000 (17:17 -0600)]
swrast: fix secondary color add for glBitmap

Also, clean up the logic involved in choosing per-vertex vs. per-fragment
primary+secondary color addition.

15 years agostw: Choose a color buffer format that matches the visual.
José Fonseca [Mon, 6 Apr 2009 22:09:02 +0000 (23:09 +0100)]
stw: Choose a color buffer format that matches the visual.

The massive ifs are ugly, but it's not worth to automate this for just a
handful of formats.

Fixes conform bcolor.c.

15 years agosoftpipe: clean up the buffer clear and tile cache code a little
Brian Paul [Mon, 6 Apr 2009 21:31:58 +0000 (15:31 -0600)]
softpipe: clean up the buffer clear and tile cache code a little

15 years agoswrast: fix incorrect arithmetic for GL_ADD_SIGNED/GL_COMBINE4_NV mode
Brian Paul [Mon, 6 Apr 2009 20:38:09 +0000 (14:38 -0600)]
swrast: fix incorrect arithmetic for GL_ADD_SIGNED/GL_COMBINE4_NV mode

15 years agost: as with swrast, interpret texture border color according to texture format
Brian Paul [Mon, 6 Apr 2009 20:06:08 +0000 (14:06 -0600)]
st: as with swrast, interpret texture border color according to texture format

Depending on the hardware driver this might not be needed, but it will
cause no harm.

15 years agost: rename a helper function
Brian Paul [Mon, 6 Apr 2009 20:00:03 +0000 (14:00 -0600)]
st: rename a helper function

15 years agoswrast: fix texture border color interpretation
Brian Paul [Mon, 6 Apr 2009 19:51:14 +0000 (13:51 -0600)]
swrast: fix texture border color interpretation

The texture border color must be interpreted according to the texture's
base format.  For example, for a GL_ALPHA texture, sampling the border
color should return (0,0,0,borderAlpha).  This wasn't an issue here until
I removed the legacy texenv code (we always use the combiner path now).