OSDN Git Service

android-x86/external-mesa.git
12 years agoglsl hierarchical visitor: Do not overwrite base_ir for parameter lists.
Paul Berry [Fri, 19 Aug 2011 04:37:31 +0000 (21:37 -0700)]
glsl hierarchical visitor: Do not overwrite base_ir for parameter lists.

This patch fixes a bug in ir_hirearchical_visitor: when traversing an
exec_list representing the formal or actual parameters of a function,
it modified base_ir to point to each parameter in turn, rather than
leaving it as a pointer to the enclosing statement.  This was a
problem, since base_ir is used by visitor classes to locate the
statement containing the node being visited (usually so that
additional statements can be inserted before or after it).  Without
this fix, visitors might attempt to insert statements into parameter
lists.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
12 years agomesa: Add missing includes to meta.h
Chad Versace [Thu, 22 Sep 2011 18:04:40 +0000 (11:04 -0700)]
mesa: Add missing includes to meta.h

Include mtypes.h.

Signed-off-by: Chad Versace <chad@chad-versace.us>
12 years agodocs: mention VMware svga driver updates in 7.12 release notes
Brian Paul [Fri, 23 Sep 2011 14:05:36 +0000 (08:05 -0600)]
docs: mention VMware svga driver updates in 7.12 release notes

12 years agosvga: indentation/formatting fixes
Brian Paul [Thu, 22 Sep 2011 23:30:34 +0000 (17:30 -0600)]
svga: indentation/formatting fixes

12 years agosvga: remove emit_consts() offset parameter
Brian Paul [Thu, 22 Sep 2011 23:19:47 +0000 (17:19 -0600)]
svga: remove emit_consts() offset parameter

It was always zero.

12 years agosvga: s/int/unsigned/ in svga_state_constants.c
Brian Paul [Thu, 22 Sep 2011 23:17:34 +0000 (17:17 -0600)]
svga: s/int/unsigned/ in svga_state_constants.c

Be consistent with other functions in the file.  And add some comments.

12 years agosvga: s/unit/shader/ and related clean-ups
Brian Paul [Thu, 22 Sep 2011 23:10:24 +0000 (17:10 -0600)]
svga: s/unit/shader/ and related clean-ups

'shader' is more intuitive.  Also s/int/unsigned/ and add assertions.

12 years agosvga: clean up return values and error codes
Brian Paul [Thu, 22 Sep 2011 23:02:59 +0000 (17:02 -0600)]
svga: clean up return values and error codes

Previously we were using a hodge podge of int vs. pipe_enum and
0 vs. PIPE_OK.  Some functions that always returned PIPE_OK were
made void.

12 years agosvga: add format translation for DXT/sRGB formats
Brian Paul [Wed, 27 Jul 2011 22:12:25 +0000 (16:12 -0600)]
svga: add format translation for DXT/sRGB formats

Without this, apps/tests that tried to use a DXT/sRGB format would die on
a failed assertion (st_texture.c:80).

12 years agosvga: test register W component in emit_kil()
Brian Paul [Wed, 27 Jul 2011 15:13:32 +0000 (09:13 -0600)]
svga: test register W component in emit_kil()

Only the XYZ components are checked to be negative by SVGA3DOP_TEXKILL.
GL_ARB_fp requires all four components be checked.  Emit a second texkill
for W if needed.

12 years agosvga: fix depth/shadow compare for non-projected texcoords
Brian Paul [Tue, 26 Jul 2011 15:19:40 +0000 (09:19 -0600)]
svga: fix depth/shadow compare for non-projected texcoords

We only need to do the divide by Q step for TXP instructions.
This fixes the incorrectly rendered soft shadow test in Lightsmark.
Along with the previous texture swizzle commit, this also fixes all
the piglit glsl-fs-shadow2d-XX.shader_test failures.

12 years agosvga: implement texture swizzling
Brian Paul [Mon, 25 Jul 2011 22:06:45 +0000 (16:06 -0600)]
svga: implement texture swizzling

This exposes the GL_EXT_texture_swizzle extension and allows the various
depth texture modes to be implemented properly.  This, plus a follow-on
texture/shadow change fixes quite a few piglit GLSL shadow sampler test
failures.

12 years agosvga: check that we don't exceed input/ouput register limits
Brian Paul [Tue, 19 Jul 2011 20:52:54 +0000 (14:52 -0600)]
svga: check that we don't exceed input/ouput register limits

12 years agosvga: implement point sprite suppport
Brian Paul [Wed, 13 Jul 2011 16:58:01 +0000 (10:58 -0600)]
svga: implement point sprite suppport

Emit the SVGA3D_RS_POINTSPRITEENABLE render state.
When sprite_coord_mode=PIPE_SPRITE_COORD_LOWER_LEFT emit extra frag
shader code to invert the Y coordinate of the incoming texcoord.

12 years agosvga: add translation for float formats
Brian Paul [Mon, 11 Jul 2011 16:30:56 +0000 (10:30 -0600)]
svga: add translation for float formats

12 years agosvga: check to avoid writing beyond end of constant buffer
Brian Paul [Mon, 20 Jun 2011 17:07:57 +0000 (11:07 -0600)]
svga: check to avoid writing beyond end of constant buffer

See bug 688394

12 years agosvga: Cleanup format capability checking.
José Fonseca [Wed, 27 Apr 2011 11:02:08 +0000 (12:02 +0100)]
svga: Cleanup format capability checking.

Accurately describe what operations are supported when a format caps
entry is not advertised by the host, and which formats are never
supported, instead of making ad-hoc and often incorrect assumptions.

12 years agosvga: Don't use the new depth formats for surfaces that will never be sampled from.
José Fonseca [Thu, 14 Apr 2011 12:28:10 +0000 (13:28 +0100)]
svga: Don't use the new depth formats for surfaces that will never be sampled from.

Mitigates issues with hosts where support for these new depth formats is
flaky.

12 years agosvga: Share one texcoord between depth and fog
Jakob Bornecrantz [Thu, 7 Apr 2011 16:23:48 +0000 (17:23 +0100)]
svga: Share one texcoord between depth and fog

12 years agosvga: Only emit Z depth work if it is actually read
Jakob Bornecrantz [Thu, 7 Apr 2011 13:07:20 +0000 (14:07 +0100)]
svga: Only emit Z depth work if it is actually read

12 years agosvga: Fix vPos usage
Jakob Bornecrantz [Wed, 6 Apr 2011 11:13:33 +0000 (12:13 +0100)]
svga: Fix vPos usage

12 years agosvga: Wip for passing depth in a texcoord
Jakob Bornecrantz [Fri, 25 Mar 2011 02:59:07 +0000 (02:59 +0000)]
svga: Wip for passing depth in a texcoord

TODO: Can we pass this as the same texcoord as fog?

12 years agosvga: Add a comment about depth format selection.
José Fonseca [Fri, 8 Apr 2011 14:21:10 +0000 (15:21 +0100)]
svga: Add a comment about depth format selection.

12 years agosvga: Consider the new depth formats in svga_texture_from_handle().
José Fonseca [Fri, 8 Apr 2011 14:12:45 +0000 (15:12 +0100)]
svga: Consider the new depth formats in svga_texture_from_handle().

12 years agosvgadump: Dump the new depth format names.
José Fonseca [Fri, 8 Apr 2011 14:11:39 +0000 (15:11 +0100)]
svgadump: Dump the new depth format names.

12 years agosvga: Expose the new depth formats
Jakob Bornecrantz [Thu, 7 Apr 2011 17:46:09 +0000 (18:46 +0100)]
svga: Expose the new depth formats

12 years agosvga: Coalesce multiple shader constants in a single command.
José Fonseca [Wed, 23 Feb 2011 18:45:04 +0000 (18:45 +0000)]
svga: Coalesce multiple shader constants in a single command.

HWv8 feature.

Tested with GoogleEarth, Mesa demos.

12 years agosvgadump: Update for svga3d_reg.h header changes.
José Fonseca [Wed, 23 Feb 2011 18:43:53 +0000 (18:43 +0000)]
svgadump: Update for svga3d_reg.h header changes.

12 years agosvga: updated svga3d_reg.h to latest public version
Brian Paul [Thu, 22 Sep 2011 16:42:41 +0000 (10:42 -0600)]
svga: updated svga3d_reg.h to latest public version

12 years agoAllow RBUG to start blocked
Alex Corscadden [Tue, 10 Aug 2010 20:37:44 +0000 (13:37 -0700)]
Allow RBUG to start blocked

It is sometimes useful to examine the first frame or and early frame of a
quickly executing and non-repeating application, this chain introduces a new
environment variable that is checked when creating contexts.  If
GALLIUM_RBUG_START_BLOCKED is set, then each context that is created is started
in a blocked state.  This allows time to connect rbug before anything is
rendered in the context.

12 years agodraw/llvm: add additional null pointer checkin draw_pt_fetch_pipeline_or_emit_llvm()
Brian Paul [Thu, 22 Sep 2011 16:29:58 +0000 (10:29 -0600)]
draw/llvm: add additional null pointer checkin draw_pt_fetch_pipeline_or_emit_llvm()

12 years agointel: fix the wrong code to detect null texture.
Yuanhan Liu [Fri, 23 Sep 2011 05:34:26 +0000 (13:34 +0800)]
intel: fix the wrong code to detect null texture.

There is already comments show how to detect a null texture. Fix the
code to match the comments.

This would fix the oglc divzero(basic.texQOrWEqualsZero) and
divzero(basic.texTrivialPrim) test case fail.

Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
12 years agoi965: fix the constant interp bitmask for flat mode
Yuanhan Liu [Tue, 6 Sep 2011 01:29:37 +0000 (09:29 +0800)]
i965: fix the constant interp bitmask for flat mode

Fix the constant interpolation enable bit mask for flat light mode.
FRAG_BIT_COL0 attribute bit might be 0, in which case we need to
shift one more bit right.

This would fix the oglc specularColor test fail on both Sandybridge and
Ivybridge.

v2: move the constant interp bitmask setup code into for(; attr <
FRAG_ATTRIB_MAX; attr++) loop suggested by Eric.

Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
12 years agoi915g: Don't generate useless swizzles before texture accesses.
Stéphane Marchesin [Fri, 23 Sep 2011 02:24:07 +0000 (19:24 -0700)]
i915g: Don't generate useless swizzles before texture accesses.

That helps reduce the number of texture indirections, which are very limited on i915.

12 years agoi915g: Fix whitespace.
Stéphane Marchesin [Thu, 22 Sep 2011 22:56:58 +0000 (15:56 -0700)]
i915g: Fix whitespace.

12 years agodocs: update relnotes-7.12 with r600g changes
Marek Olšák [Fri, 23 Sep 2011 01:01:00 +0000 (03:01 +0200)]
docs: update relnotes-7.12 with r600g changes

12 years agost/mesa: remove unnecessary st_texture_match_image() parameters
Brian Paul [Thu, 22 Sep 2011 22:32:49 +0000 (16:32 -0600)]
st/mesa: remove unnecessary st_texture_match_image() parameters

We didn't use the face parameter and the level parameter can be found
in the gl_texture_image.

12 years agoi915g: Fix peephole optimization for MOVs.
Stéphane Marchesin [Thu, 22 Sep 2011 19:43:24 +0000 (12:43 -0700)]
i915g: Fix peephole optimization for MOVs.

12 years agoi915g: Add unsupported PIPE_CAP_MIN_TEXEL_OFFSET/PIPE_CAP_MAX_TEXEL_OFFSET.
Stéphane Marchesin [Thu, 22 Sep 2011 19:00:24 +0000 (12:00 -0700)]
i915g: Add unsupported PIPE_CAP_MIN_TEXEL_OFFSET/PIPE_CAP_MAX_TEXEL_OFFSET.

12 years agointel: Unindent the blit call in PBO blit uploads.
Eric Anholt [Wed, 21 Sep 2011 16:51:58 +0000 (09:51 -0700)]
intel: Unindent the blit call in PBO blit uploads.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
12 years agointel: Drop gratuitous flush in PBO blit upload.
Eric Anholt [Wed, 21 Sep 2011 16:50:06 +0000 (09:50 -0700)]
intel: Drop gratuitous flush in PBO blit upload.

Since the blit gets sequenced after other batchbuffer rendering like
normal, there's no need to push things out early.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
12 years agointel: Clean up check_pbo_format to ignore internalFormat.
Eric Anholt [Wed, 21 Sep 2011 16:37:51 +0000 (09:37 -0700)]
intel: Clean up check_pbo_format to ignore internalFormat.

All that matters here is the format of the texture, not the
internalformat (which might mean various different pixel formats).  In
one case, the pbo upload for MESA_FORMAT_YCBCR would have swapped the
channels for MESA_FORMAT_YCBCR_REV.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
12 years agointel: Move more of the PBO blit upload logic into that function.
Eric Anholt [Wed, 21 Sep 2011 16:32:57 +0000 (09:32 -0700)]
intel: Move more of the PBO blit upload logic into that function.

This also improves the debugging output in the failure paths so you
get more than just "failed", and don't get spammed with "failed" when
you didn't even have a PBO to try.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
12 years agointel: Remove stale comment about non-intel gl_buffer_objects.
Eric Anholt [Wed, 21 Sep 2011 16:27:51 +0000 (09:27 -0700)]
intel: Remove stale comment about non-intel gl_buffer_objects.

This hasn't been true since dd26899ca39111e0866afed9df94bfb1618dd363
in 2009.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
12 years agointel: Remove the pbo zero-copy code.
Eric Anholt [Wed, 21 Sep 2011 16:10:19 +0000 (09:10 -0700)]
intel: Remove the pbo zero-copy code.

There were notes about the possibility of slowdowns due to zcopy from
a PBO due to thrashing around of the region.  Slowdowns are even more
likely now that textures are generally tiled, which a zcopy wouldn't
get.  Additionally, there were no checks on the buffer size to ensure
that the hardware-required rounding was present, which could result in
GPU hangs on large zcopy PBOs.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
12 years agointel: Remove extra FreeTextureImageBuffer() from glTexImage*.
Eric Anholt [Wed, 21 Sep 2011 16:02:40 +0000 (09:02 -0700)]
intel: Remove extra FreeTextureImageBuffer() from glTexImage*.

The core code does this before calling in to us.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
12 years agoi965: Add support for GL_EXT_packed_float.
Eric Anholt [Tue, 20 Sep 2011 22:27:07 +0000 (15:27 -0700)]
i965: Add support for GL_EXT_packed_float.

This doesn't cover support for this format as a renderbuffer yet.  The
spec allows implementations to not support it, though it is something
we do want to support.

Only one failure in piglit on gen6, which is texwrap with bordercolor
(as usual).

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
12 years agoi965: Add support for GL_EXT_texture_shared_exponent.
Eric Anholt [Tue, 20 Sep 2011 22:14:53 +0000 (15:14 -0700)]
i965: Add support for GL_EXT_texture_shared_exponent.

Only one failure in piglit on gen6, which is texwrap with bordercolor
(as usual).

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
12 years agomesa: remove support for GL_APPLE_client_storage extension
Brian Paul [Thu, 22 Sep 2011 00:54:53 +0000 (18:54 -0600)]
mesa: remove support for GL_APPLE_client_storage extension

AFAIK, there are few users of this extension and I can see a couple
reasons why this is probably broken in Mesa anyway.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
12 years agomesa: move gl_texture_image::Width/Height/DepthScale fields to swrast
Brian Paul [Thu, 22 Sep 2011 00:54:53 +0000 (18:54 -0600)]
mesa: move gl_texture_image::Width/Height/DepthScale fields to swrast

These fields were only used for swrast so move them into
swrast_texture_image.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
12 years agomesa: move gl_texture_image::_IsPowerOfTwo into swrast
Brian Paul [Thu, 22 Sep 2011 00:54:53 +0000 (18:54 -0600)]
mesa: move gl_texture_image::_IsPowerOfTwo into swrast

It's only used by swrast.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
12 years agost/mesa: Finalize texture on render-to-texture.
Michel Dänzer [Thu, 22 Sep 2011 15:01:18 +0000 (17:01 +0200)]
st/mesa: Finalize texture on render-to-texture.

This makes sure that stObj->pt exists and is up to date.

Fixes https://bugs.freedesktop.org/show_bug.cgi?id=39193 and piglit
fbo-incomplete-texture-03.

Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
NOTE: This is a candidate for the 7.11 branch.

12 years agost/mesa: Convert size assertions to conditionals in st_texture_image_copy.
Brian Paul [Thu, 22 Sep 2011 15:01:18 +0000 (17:01 +0200)]
st/mesa: Convert size assertions to conditionals in st_texture_image_copy.

Prevents potential assertion failures in piglit fbo-incomplete-texture-03 test.

NOTE: This is a candidate for the 7.11 branch.

12 years agod3d1x: setup draw info primitive restart parameters
Christoph Bumiller [Thu, 22 Sep 2011 14:43:19 +0000 (16:43 +0200)]
d3d1x: setup draw info primitive restart parameters

12 years agodraw: add support for guard-band clipping
Brian Paul [Wed, 21 Sep 2011 18:06:17 +0000 (12:06 -0600)]
draw: add support for guard-band clipping

12 years agodraw: Reduce the number of vertex shader variants per context to 128.
José Fonseca [Wed, 14 Jul 2010 14:12:33 +0000 (15:12 +0100)]
draw: Reduce the number of vertex shader variants per context to 128.

12 years agodraw: Respect max_indices from the renderer.
Kurt Daverman [Mon, 7 Mar 2011 13:11:03 +0000 (13:11 +0000)]
draw: Respect max_indices from the renderer.

12 years agotranslate: check for PIPE_SUBSYSTEM_EMBEDDED
Brian Paul [Wed, 21 Sep 2011 17:37:49 +0000 (11:37 -0600)]
translate: check for PIPE_SUBSYSTEM_EMBEDDED

12 years agotgsi: Check in scan for fs position and depth reads
Jakob Bornecrantz [Thu, 7 Apr 2011 12:20:33 +0000 (13:20 +0100)]
tgsi: Check in scan for fs position and depth reads

12 years agosvga: skip assertion when index_bias < 0
Brian Paul [Mon, 20 Jun 2011 16:45:17 +0000 (10:45 -0600)]
svga: skip assertion when index_bias < 0

See bug 688383

12 years agosvga: fix the test for sRGB texture formats
Brian Paul [Wed, 27 Jul 2011 22:08:58 +0000 (16:08 -0600)]
svga: fix the test for sRGB texture formats

The pipe_sampler_view::format field should be prefered over the resource/
texture format.  The former is used to override the texture format for
sRGB decode enable/disable, etc.

Also, use new util_format_is_srgb() helper to catch all sRGB formats.

This fixes the piglit tex-srgb test for GL_EXT_texture_sRGB_decode.

12 years agogallium/util: add util_format_is_srgb() helper
Brian Paul [Wed, 27 Jul 2011 22:08:13 +0000 (16:08 -0600)]
gallium/util: add util_format_is_srgb() helper

12 years agoutil: add u_bit_scan helper
Keith Whitwell [Wed, 21 Sep 2011 17:22:43 +0000 (11:22 -0600)]
util: add u_bit_scan helper

12 years agoutil: Allow to make the depth/stencil format queries without repeatedly looking up...
José Fonseca [Wed, 21 Sep 2011 17:15:10 +0000 (11:15 -0600)]
util: Allow to make the depth/stencil format queries without repeatedly looking up the format description.

All functions here should take struct util_format_description * IMO, to
incentive efficient code.

12 years agoutil: single call to util_format_description in fill_rect
Keith Whitwell [Wed, 21 Sep 2011 17:14:04 +0000 (11:14 -0600)]
util: single call to util_format_description in fill_rect

12 years agoutil: Handle conversion between depth stencil formats.
José Fonseca [Mon, 16 Aug 2010 10:26:13 +0000 (11:26 +0100)]
util: Handle conversion between depth stencil formats.

12 years agoi915g: Add an optimization to get rid of useless movs, in particular at the end of...
Stéphane Marchesin [Thu, 22 Sep 2011 00:54:24 +0000 (17:54 -0700)]
i915g: Add an optimization to get rid of useless movs, in particular at the end of some shaders.

12 years agoi915g: Fix some whitespace problems.
Stéphane Marchesin [Thu, 22 Sep 2011 00:59:26 +0000 (17:59 -0700)]
i915g: Fix some whitespace problems.

12 years agoi915g: Blend equation separate seems to work.
Stéphane Marchesin [Thu, 22 Sep 2011 00:58:59 +0000 (17:58 -0700)]
i915g: Blend equation separate seems to work.

12 years agoi915g: Add ifdef'd out code to dump compiled shaders.
Stéphane Marchesin [Thu, 22 Sep 2011 00:55:26 +0000 (17:55 -0700)]
i915g: Add ifdef'd out code to dump compiled shaders.

12 years agoi915g: Fix bug in shader optimizer.
Stéphane Marchesin [Thu, 22 Sep 2011 00:53:22 +0000 (17:53 -0700)]
i915g: Fix bug in shader optimizer.

12 years agoi915g: Remove stale function prototype.
Stéphane Marchesin [Thu, 22 Sep 2011 00:30:39 +0000 (17:30 -0700)]
i915g: Remove stale function prototype.

12 years agosvga: call u_default_redefine_user_buffer() to fix failed assertion
Brian Paul [Wed, 21 Sep 2011 22:32:00 +0000 (16:32 -0600)]
svga: call u_default_redefine_user_buffer() to fix failed assertion

This fixes a regression from a8cf4b6acf9ee996090cc0bb95fa3558b481108c

The problem occured when two successive glDrawArrays calls accessed
subsequent elements in user-space arrays.  The user-space array
from the first call wasn't being grown to accomodate the second
draw call's elements.

Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
12 years agometa: Don't hang on to program refcounts after metaops are done.
Eric Anholt [Tue, 20 Sep 2011 23:23:57 +0000 (16:23 -0700)]
meta: Don't hang on to program refcounts after metaops are done.

Fixes piglit ARB_shader_objects/clear-with-deleted.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=39577
Reviewed-by: Brian Paul <brianp@vmware.com>
12 years agoi965/vs: Return a dummy value when visiting ir_texture.
Eric Anholt [Thu, 8 Sep 2011 23:09:31 +0000 (16:09 -0700)]
i965/vs: Return a dummy value when visiting ir_texture.

While the program won't successfully link in the end, this avoids
possible assertion failure in the driver during linking if
this->result isn't initialized with something already.

12 years agoi965/gen6+: When only BFC is written, use BFC as the color.
Eric Anholt [Thu, 8 Sep 2011 22:31:22 +0000 (15:31 -0700)]
i965/gen6+: When only BFC is written, use BFC as the color.

Fixes piglit vertex-program-two-side enabled back back2

12 years agoi965/gen6+: Respect the VERTEX_PROGRAM_TWO_SIDE flag for shaders.
Eric Anholt [Thu, 8 Sep 2011 22:29:02 +0000 (15:29 -0700)]
i965/gen6+: Respect the VERTEX_PROGRAM_TWO_SIDE flag for shaders.

Fixes piglit:
vertex-program-two-side enabled front back front2 back2
vertex-program-two-side enabled front back
vertex-program-two-side enabled front2 back2

12 years agomesa: Add a context flag indicating whether two-sided lighting should happen.
Eric Anholt [Thu, 8 Sep 2011 22:14:33 +0000 (15:14 -0700)]
mesa: Add a context flag indicating whether two-sided lighting should happen.

The 965 driver was ignoring the VERTEX_PROGRAM_TWO_SIDE flag and only
looking at fixed-function state.

12 years agoutil: remove stray debug code
Brian Paul [Wed, 21 Sep 2011 14:26:29 +0000 (08:26 -0600)]
util: remove stray debug code

12 years agomesa: check glBegin()/glDrawArrays()/etc mode with _mesa_valid_prim_mode()
Brian Paul [Wed, 21 Sep 2011 14:22:07 +0000 (08:22 -0600)]
mesa: check glBegin()/glDrawArrays()/etc mode with _mesa_valid_prim_mode()

We now raise an GL_INVALID_ENUM in glBegin() if mode is illegal, as was
done in Yuanhan Liu's original patch.

Take geometry shaders support into account too.

Reviewed-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
12 years agogallivm: fix build with llvm 3.0svn
Brian Paul [Wed, 21 Sep 2011 13:24:00 +0000 (07:24 -0600)]
gallivm: fix build with llvm 3.0svn

https://bugs.freedesktop.org/show_bug.cgi?id=41065

12 years agotnl: include swrast/s_chan.h to fix sse build
Brian Paul [Wed, 21 Sep 2011 12:49:09 +0000 (06:49 -0600)]
tnl: include swrast/s_chan.h to fix sse build

12 years agost/vega: fix drawing images with alpha channel
Chia-I Wu [Wed, 21 Sep 2011 03:40:27 +0000 (11:40 +0800)]
st/vega: fix drawing images with alpha channel

Checking if the paints are opaque in renderer_validate_blend() does not
work.  We could be drawing images.  Remove the check from
renderer_validate_blend() and take image drawing into consideration in
blend_use_shader().

The bug was introduced by 3f0a966807f03a364edea0272ddf45f08ab7ce4f,
which affects the lookup demo.

12 years agost/vega: fix vg_context_is_object_valid()
Chia-I Wu [Wed, 21 Sep 2011 02:48:21 +0000 (10:48 +0800)]
st/vega: fix vg_context_is_object_valid()

vg_context_is_object_valid() checks if a handle is valid by checking if
the handle is a valid key of the object hash table.  However, the keys
of the object hash table were object pointers.

Fix vg_context_add_object() to use the handles as the keys so that
vg_context_is_object_valid() works.  This bug was introduced by
99c67f27d35a4bbbbefada8117d5972c7583cf42.

12 years agoswrast: s/GLubyte/GLchan/ in a cast
Brian Paul [Wed, 21 Sep 2011 03:06:19 +0000 (21:06 -0600)]
swrast: s/GLubyte/GLchan/ in a cast

12 years agollvmpipe: silence a pointer type warning
Brian Paul [Wed, 21 Sep 2011 02:33:45 +0000 (20:33 -0600)]
llvmpipe: silence a pointer type warning

12 years agometa: use _mesa_set_enable() in more places
Brian Paul [Tue, 20 Sep 2011 17:55:58 +0000 (11:55 -0600)]
meta: use _mesa_set_enable() in more places

Avoids an extra context lookup.

Reviewed-by: Eric Anholt <eric@anholt.net>
12 years agometa: use _mesa_set_enable(), fix decompress_texture_image()
Brian Paul [Tue, 20 Sep 2011 17:48:57 +0000 (11:48 -0600)]
meta: use _mesa_set_enable(), fix decompress_texture_image()

Use _mesa_set_enable() to avoid a redudant context lookup.
Need to disable the texture target in decompress_texture_image() so the
unit isn't still enabled after glGetTexImage() returns.  Arguably, the
meta restore code should do this, but it doesn't.

Reviewed-by: Eric Anholt <eric@anholt.net>
12 years agost/mesa: specify source mipmap level in decompress_with_blit()
Brian Paul [Sat, 17 Sep 2011 19:21:08 +0000 (13:21 -0600)]
st/mesa: specify source mipmap level in decompress_with_blit()

This, along with the previous patch, fixes glGetTexImage() of compressed
textures for level > 0.

12 years agogallium/util: observe sampler view's first_level in util_blit_pixels_tex()
Brian Paul [Sat, 17 Sep 2011 19:19:52 +0000 (13:19 -0600)]
gallium/util: observe sampler view's first_level in util_blit_pixels_tex()

This lets us blit from a non-zero source level.

12 years agometa: fix broken sRGB mipmap generation
Brian Paul [Sat, 17 Sep 2011 17:26:54 +0000 (11:26 -0600)]
meta: fix broken sRGB mipmap generation

If we're generating a mipmap for an sRGB texture we need to bypass
sRGB->linear conversion.  Otherwise the destination mipmap level
(drawn with a textured quad) will have the wrong colors.
If we can't turn of sRGB->linear conversion (GL_EXT_texture_sRGB_decode)
we need to use the software fallback for mipmap generation.

Note: This is a candidate for the 7.11 branch.

12 years agomesa: fix PACK_COLOR_5551(), PACK_COLOR_1555() macros
Brian Paul [Tue, 20 Sep 2011 00:25:38 +0000 (18:25 -0600)]
mesa: fix PACK_COLOR_5551(), PACK_COLOR_1555() macros

The 1-bit alpha channel was incorrectly encoded.  Previously, any non-zero
alpha value for the ubyte alpha value would set A=1.  Instead, use the
most significant bit of the ubyte alpha to determine the A bit.  This is
consistent with the other channels and other OpenGL implementations.

Note: This is a candidate for the 7.11 branch.

Reviewed-by: Michel Dänzer <michel@daenzer.net>
12 years agomesa: move last bits of GLchan stuff into swrast
Brian Paul [Sat, 17 Sep 2011 22:31:03 +0000 (16:31 -0600)]
mesa: move last bits of GLchan stuff into swrast

This removes the last remnants of the GLchan datatype and associated
macros out of core Mesa and into swrast.

12 years agomesa: remove CHAN_TYPE cruft from debug.c
Brian Paul [Sat, 17 Sep 2011 22:22:47 +0000 (16:22 -0600)]
mesa: remove CHAN_TYPE cruft from debug.c

12 years agomesa: remove unused interp/stride chan macros
Brian Paul [Sat, 17 Sep 2011 22:20:18 +0000 (16:20 -0600)]
mesa: remove unused interp/stride chan macros

12 years agomesa: remove unused UNCLAMPED_FLOAT_TO_RGB_CHAN() macro
Brian Paul [Sat, 17 Sep 2011 22:17:46 +0000 (16:17 -0600)]
mesa: remove unused UNCLAMPED_FLOAT_TO_RGB_CHAN() macro

12 years agoradeon: use _mesa_unclamped_float_rgba_to_ubyte()
Brian Paul [Sat, 17 Sep 2011 22:12:33 +0000 (16:12 -0600)]
radeon: use _mesa_unclamped_float_rgba_to_ubyte()

12 years agor200: use _mesa_unclamped_float_rgba_to_ubyte()
Brian Paul [Sat, 17 Sep 2011 22:12:27 +0000 (16:12 -0600)]
r200: use _mesa_unclamped_float_rgba_to_ubyte()

12 years agomesa: remove unused <type>_TO_CHAN() macros
Brian Paul [Sat, 17 Sep 2011 22:08:27 +0000 (16:08 -0600)]
mesa: remove unused <type>_TO_CHAN() macros

12 years agomesa: convert _mesa_unpack_color_span_chan() to ubyte
Brian Paul [Sat, 17 Sep 2011 21:55:03 +0000 (15:55 -0600)]
mesa: convert _mesa_unpack_color_span_chan() to ubyte