mesa.git
13 years agoi965: Make gen6_resolve_implied_move a no-op for MRF sources.
Kenneth Graunke [Tue, 15 Nov 2011 03:49:54 +0000 (19:49 -0800)]
i965: Make gen6_resolve_implied_move a no-op for MRF sources.

Attempting to move an MRF to a MRF is not only pointless, it will fail
because MRFs are read-only, resulting in garbage in your register.

If we already set up a MRF source, there's nothing to resolve anyway.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
13 years agomesa: Renumber the tnl attributes to match VERT_ATTRIB*.
Mathias Fröhlich [Thu, 1 Dec 2011 17:31:06 +0000 (18:31 +0100)]
mesa: Renumber the tnl attributes to match VERT_ATTRIB*.

Also renumber the tnl modules vertex attributes to match
the renumbered VERT_ATTRIB_* values.

This should fix

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

Signed-off-by: Mathias Froehlich <Mathias.Froehlich@web.de>
Tested-by: Vinson Lee <vlee@vmware.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
13 years agomesa: Extend BITSET64_*_RANGE to work on arbitrary ranges.
Mathias Fröhlich [Thu, 1 Dec 2011 17:29:18 +0000 (18:29 +0100)]
mesa: Extend BITSET64_*_RANGE to work on arbitrary ranges.

The BITSET64_{TEST,SET,CLEAR}_RANGE macros only work on ranges
wither in the lower 32 or in the upper 32 bits of the bitset.
This change extends these macros to work on arbitrary ranges
possibly crossing the bitset word boundary.

Signed-off-by: Mathias Froehlich <Mathias.Froehlich@web.de>
Reviewed-by: Brian Paul <brianp@vmware.com>
13 years agoi915g: Implement GL_STREAM_* for textures by using untiled textures.
Stéphane Marchesin [Thu, 10 Nov 2011 00:46:24 +0000 (16:46 -0800)]
i915g: Implement GL_STREAM_* for textures by using untiled textures.

13 years agoi915g: Add unsupported PIPE_SHADER_CAP_OUTPUT_READ to silence warnings.
Stéphane Marchesin [Fri, 2 Dec 2011 02:09:18 +0000 (18:09 -0800)]
i915g: Add unsupported PIPE_SHADER_CAP_OUTPUT_READ to silence warnings.

13 years agodocs: list GL_OES_compressed_ETC1_RGB8_texture in 7.12 release notes
Chia-I Wu [Wed, 30 Nov 2011 04:29:54 +0000 (12:29 +0800)]
docs: list GL_OES_compressed_ETC1_RGB8_texture in 7.12 release notes

Reviewed-by: Brian Paul <brianp@vmware.com>
13 years agost/mesa: add support for GL_OES_compressed_ETC1_RGB8_texture
Chia-I Wu [Tue, 29 Nov 2011 04:49:36 +0000 (12:49 +0800)]
st/mesa: add support for GL_OES_compressed_ETC1_RGB8_texture

Have st/mesa recognize MESA_FORMAT_ETC1_RGB8 then we are good to advertise the
extension.

Reviewed-by: Brian Paul <brianp@vmware.com>
13 years agogallium: add PIPE_FORMAT_ETC1_RGB8
Chia-I Wu [Mon, 28 Nov 2011 16:10:37 +0000 (00:10 +0800)]
gallium: add PIPE_FORMAT_ETC1_RGB8

The format is defined by GL_OES_compressed_ETC1_RGB8_texture.

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
13 years agomesa: add support for GL_OES_compressed_ETC1_RGB8_texture
Chia-I Wu [Mon, 28 Nov 2011 08:57:02 +0000 (16:57 +0800)]
mesa: add support for GL_OES_compressed_ETC1_RGB8_texture

Add support for GL_OES_compressed_ETC1_RGB8_texture to core mesa.  There is no
driver support yet.

Unlike desktop GL compressed texture formats, GLES compressed texture formats
usually can only be used with glCompressedTexImage2D.  All other gl*Tex*Image*
functions are updated to check for that.

Reviewed-by: Brian Paul <brianp@vmware.com>
13 years agomesa: add ETC1 decoding routines
Chia-I Wu [Mon, 28 Nov 2011 15:55:31 +0000 (23:55 +0800)]
mesa: add ETC1 decoding routines

The format is defined by GL_OES_compressed_ETC1_RGB8_texture.  These routines
will be used in the following commit.

Reviewed-by: Brian Paul <brianp@vmware.com>
13 years agoglapi: regenerate files for GL_OES_compressed_ETC1_RGB8_texture
Chia-I Wu [Mon, 28 Nov 2011 08:41:10 +0000 (16:41 +0800)]
glapi: regenerate files for GL_OES_compressed_ETC1_RGB8_texture

Reviewed-by: Brian Paul <brianp@vmware.com>
13 years agoglapi: add GL_OES_compressed_ETC1_RGB8_texture for GLES
Chia-I Wu [Mon, 28 Nov 2011 08:40:52 +0000 (16:40 +0800)]
glapi: add GL_OES_compressed_ETC1_RGB8_texture for GLES

Reviewed-by: Brian Paul <brianp@vmware.com>
13 years agoswrast: Fix signed/unsigned problems with negative strides.
Mathias Fröhlich [Thu, 1 Dec 2011 19:48:10 +0000 (20:48 +0100)]
swrast: Fix signed/unsigned problems with negative strides.

In swrast_map_renderbuffer negative strides lead to
render buffer map pointers that are off by 2^32.
Make sure that intermediate negative values are not
converted to an unsigned.

Signed-off-by: Mathias Froehlich <Mathias.Froehlich@web.de>
Reviewed-by: Brian Paul <brianp@vmware.com>
13 years agou_vbuf: Silence uninitialized variable warnings.
Vinson Lee [Wed, 30 Nov 2011 23:32:16 +0000 (15:32 -0800)]
u_vbuf: Silence uninitialized variable warnings.

Fixes these GCC warnings.
u_vbuf.c: In function ‘u_vbuf_draw_begin’:
u_vbuf.c:839:20: warning: ‘max_index’ may be used uninitialized in this function [-Wuninitialized]
u_vbuf.c:838:20: warning: ‘min_index’ may be used uninitialized in this function [-Wuninitialized]

Signed-off-by: Vinson Lee <vlee@vmware.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
13 years agor600g: add some new pci ids
Alex Deucher [Thu, 1 Dec 2011 00:34:15 +0000 (19:34 -0500)]
r600g: add some new pci ids

Note: this is a candidate for the stable branches.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
13 years agomesa: fix unpack_ARGB1555_REV()
Brian Paul [Thu, 1 Dec 2011 03:35:02 +0000 (20:35 -0700)]
mesa: fix unpack_ARGB1555_REV()

We weren't doing the necessary byte swap.

v2: use same arithmetic as unpack_ARGB1555() to be consistent.

Reviewed-by: Michel Dänzer <michel@daenzer.net>
13 years agomesa: fix indentation in attrib.c
Brian Paul [Thu, 1 Dec 2011 03:35:02 +0000 (20:35 -0700)]
mesa: fix indentation in attrib.c

13 years agoi965/fs: Fix regression in fbo-alphatest-nocolor.
Eric Anholt [Wed, 23 Nov 2011 18:20:12 +0000 (10:20 -0800)]
i965/fs: Fix regression in fbo-alphatest-nocolor.

In the refactor for handling user-defined out params, we failed to set
up the new color output tracking when there was no color drawbuffer in
place but alpha testing was on.  Just always set up at least one when
handling gl_FragColor, since we won't make use of its value unless we
need to.

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

13 years agoi965/fs: Make register file enum 0 be the undefined register file.
Eric Anholt [Wed, 23 Nov 2011 18:13:39 +0000 (10:13 -0800)]
i965/fs: Make register file enum 0 be the undefined register file.

In 6d874d0ee18b3694c49e0206fa519bd8b746ec24, I checked whether a
register that had been stored was BAD_FILE (as opposed to a legitimate
GRF), but actually the unset register was ARF NULL because it had been
memset to 0.  Finding BAD_FILE for unset values in debugging was my
intention with that file, so make it the case more often by
rearranging the enum.  There was only one place we relied on the magic
enum register_file to hardware register file correspondance anyway.

13 years agoi965: Don't perform the precompile on fragment shaders by default.
Eric Anholt [Wed, 23 Nov 2011 18:01:39 +0000 (10:01 -0800)]
i965: Don't perform the precompile on fragment shaders by default.

It is useful to have this option for shader-db, and it was also good
at the time where we were rejecting shaders due to various internal
limits we hadn't supported yet.  However, at this point the precompile
step takes extra time (since not all NOS is known at link time) and
spews misleading debug in the common case of debugging a real app.

This is left in place for VS, where we still have a couple of codegen
failure paths that result in link failure through precompile.  Those
need to be fixed.

shader-db can still get at the debug info it wants using
"shader_precompile=true" driconf option.  Long term, we can probably
build a good-enough app for shader-db to trigger real codegen.

13 years agogallium/failover: Remove the deprecated module.
Kai Wasserbäch [Tue, 29 Nov 2011 21:36:02 +0000 (22:36 +0100)]
gallium/failover: Remove the deprecated module.

Signed-off-by: Kai Wasserbäch <kai@dev.carbon-project.org>
Signed-off-by: José Fonseca <jfonseca@vmware.com>
13 years agost/mesa: fix indentation
Brian Paul [Wed, 30 Nov 2011 14:09:46 +0000 (07:09 -0700)]
st/mesa: fix indentation

13 years agomesa: use _mesa_is_bufferobj() in update_array()
Brian Paul [Tue, 29 Nov 2011 14:44:20 +0000 (07:44 -0700)]
mesa: use _mesa_is_bufferobj() in update_array()

13 years agomesa: use Elements() macro in program printing code
Brian Paul [Tue, 29 Nov 2011 14:36:50 +0000 (07:36 -0700)]
mesa: use Elements() macro in program printing code

13 years agomesa: fix signed/unsigned comparison warning
Brian Paul [Tue, 29 Nov 2011 14:33:47 +0000 (07:33 -0700)]
mesa: fix signed/unsigned comparison warning

13 years agomesa: fix MESA_FORMAT_RG88 format match test
Brian Paul [Tue, 29 Nov 2011 14:26:37 +0000 (07:26 -0700)]
mesa: fix MESA_FORMAT_RG88 format match test

Reviewed-by: Eric Anholt <eric@anholt.net>
13 years agomesa: fix printf format warning in _mesa_fprint_program_parameters()
Brian Paul [Tue, 29 Nov 2011 14:26:01 +0000 (07:26 -0700)]
mesa: fix printf format warning in _mesa_fprint_program_parameters()

13 years agotnl: s/INLINE/inline/
Brian Paul [Tue, 29 Nov 2011 01:13:44 +0000 (18:13 -0700)]
tnl: s/INLINE/inline/

13 years agomesa: regenerated dispatch.h (s/INLINE/inline/)
Brian Paul [Tue, 29 Nov 2011 01:13:44 +0000 (18:13 -0700)]
mesa: regenerated dispatch.h (s/INLINE/inline/)

13 years agoglapi: s/INLINE/inline/ for dispatch.h file
Brian Paul [Tue, 29 Nov 2011 01:13:44 +0000 (18:13 -0700)]
glapi: s/INLINE/inline/ for dispatch.h file

13 years agoswrast: use STATIC_ASSERT to make sure texfetch table isn't missing entries
Brian Paul [Tue, 29 Nov 2011 01:13:44 +0000 (18:13 -0700)]
swrast: use STATIC_ASSERT to make sure texfetch table isn't missing entries

When new MESA_FORMAT_x enums are added we need to add a new entry in
the table of texture fetch functions.  In the past this has been
missed if swrast isn't actually tested.  Using a static assertion
should help with that.

13 years agomesa: add STATIC_ASSERT() macro for compile-time assertions
Brian Paul [Tue, 29 Nov 2011 01:13:43 +0000 (18:13 -0700)]
mesa: add STATIC_ASSERT() macro for compile-time assertions

This can be used to check that tables have the right number of entries,
etc. at compile-time.  This will hopefully catch things that are missed
if particular drivers aren't tested, for example.

v2: Simplify the macro to omit the extra line number info (the compiler
already indicates the line number).  And wrap the macro for readability.

13 years agomesa: access pixels as GLushort in unpack_SL8()
Brian Paul [Mon, 28 Nov 2011 18:08:01 +0000 (11:08 -0700)]
mesa: access pixels as GLushort in unpack_SL8()

Per the format comments and the texstore code, use a GLushort to access the
pixel.  The code was OK as-is on little endian machines.

13 years agomesa: Make _mesa_is_stencil_format() consistent with _mesa_is_depth_format().
Eric Anholt [Tue, 22 Nov 2011 02:03:30 +0000 (18:03 -0800)]
mesa: Make _mesa_is_stencil_format() consistent with _mesa_is_depth_format().

There was only one consumer of this API, meta.c, which was intending
to ask "is this format just stencil index (and nothing else)?".
Instead, if one tried to glDrawPixels of GL_DEPTH_STENCIL-type
formats, it would just try to draw the stencil parts.  Nothing good
came of this.

This function looks rather silly at this point, but I'm leaving it in
place to be the obvious parallel API to _mesa_is_depth_format().  Note
that if you want the old behavior, you should use it as
(_mesa_is_stencil_format() || _mesa_is_depthstencil_format()) like is
commonly done for depth-related tests.

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
13 years agomesa: Fix the datatype of GL_DEPTH32F_STENCIL8's depth channel.
Eric Anholt [Fri, 18 Nov 2011 01:26:41 +0000 (17:26 -0800)]
mesa: Fix the datatype of GL_DEPTH32F_STENCIL8's depth channel.

Asking for the datatype of MESA_FORMAT_Z32_FLOAT_X24S8 is a bit funny
-- there's a float depth channel, and a stencil channel that doesn't
have a particular GLenum associated with its type, so what's the
correct response?

Because there is no query for stencil, just make this format's
datatype be that of the depth channel.  It fixes the depth query (and
thus a failure in piglit gl-3.0-required-sized-formats), and none of
the other consumers of the _mesa_get_format_datatype() API care.

v2: Add a comment for why the DataType is this way for this format.

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
13 years agoi965: Always handle GL_DEPTH_TEXTURE_MODE through the shader.
Eric Anholt [Fri, 18 Nov 2011 01:01:58 +0000 (17:01 -0800)]
i965: Always handle GL_DEPTH_TEXTURE_MODE through the shader.

We were already doing it through the shader (layered underneath
GL_EXT_texture_swizzle) in the shadow compare case.  This avoids
having per-format logic for switching out the surface format dependent
on the depth mode.

v2: Also do the swizzling for DEPTH_STENCIL.  oops.

Reviewed-by: Ian Romanick <idr@freedesktop.org>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
13 years agoi965: Fix EXT_texture_swizzle with a writemask in the FFFS/FP backend.
Eric Anholt [Tue, 22 Nov 2011 01:46:22 +0000 (17:46 -0800)]
i965: Fix EXT_texture_swizzle with a writemask in the FFFS/FP backend.

I tripped over this bug in the next commit, relying on our
EXT_texture_swizzle to do some shadow sampler-related swizzling.  If a
writemask was masking out a channel of the destination that was a live
channel of the texture swizzle, it would read undefined values.

Fixes piglit ARB_fragment_program_shadow/masked.

Reviewed-by: Ian Romanick <idr@freedesktop.org>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
13 years agoi965: Base HW depth format setup based on MESA_FORMAT, not bpp.
Eric Anholt [Thu, 17 Nov 2011 22:45:54 +0000 (14:45 -0800)]
i965: Base HW depth format setup based on MESA_FORMAT, not bpp.

This will make handling new formats (like actually exposing Z32F)
easier and more reliable.

v2: Remove the check for hiz buffer -- the MESA_FORMAT should really
    be giving us the value we want even for hiz.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
13 years agogallium/cell: Remove the driver.
Kai Wasserbäch [Tue, 29 Nov 2011 17:17:47 +0000 (18:17 +0100)]
gallium/cell: Remove the driver.

Complicates Gallium3D development and doesn't seem to have active users.

Signed-off-by: Kai Wasserbäch <kai@dev.carbon-project.org>
Signed-off-by: José Fonseca <jfonseca@vmware.com>
13 years agoi965: Don't depth test the fake depthbuffer when one isn't present.
Eric Anholt [Wed, 23 Nov 2011 00:26:55 +0000 (16:26 -0800)]
i965: Don't depth test the fake depthbuffer when one isn't present.

For the non-separate-stencil-only case, we've been using a NULL
surface for depth, so we didn't have to care.  However, to support
separate stencil with no depthbuffer, we have to make the depth
surface non-NULL or the stencil test always fails thanks to separate
stencil inheriting the surface type of depth.

Fixes hiz-depth-stencil-test-d0-s8.

Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
13 years agomesa: Allow generic attributes for glGetActiveAttrib and GL_ACTIVE_ATTRIBUTES
Ian Romanick [Tue, 22 Nov 2011 04:47:57 +0000 (20:47 -0800)]
mesa: Allow generic attributes for glGetActiveAttrib and GL_ACTIVE_ATTRIBUTES

Page 77 (page 91 of the PDF) says about glGetActiveAttrib:

    "The returned attribute name can be the name of a generic
    attribute or a conventional attribute (which begin with the prefix
    "gl_", see the OpenGL Shading Language specification for a
    complete list)."

Page 261 (page 275 of the PDF) says about glGetProgramiv:

    "If pname is ACTIVE_ATTRIBUTES, the number of active attributes in
    program is returned."

It doesn't say anything about built-in vs. user-defined attributes.
From the language around glGetActiveAttrib and the lack of an
exclusion of built-in attributes, which exists other places (e.g.,
around glBindAttribLocation), we can infer that GL_ACTIVE_ATTRIBUTES
should include the active attribute count.  It should also be included
in the values returned by glGetActiveAttrib.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=43138
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Tested-by: Yi Sun <yi.sun@intel.com>
13 years agoswrast: Fix some static analysis warnings
Chad Versace [Mon, 28 Nov 2011 19:45:03 +0000 (11:45 -0800)]
swrast: Fix some static analysis warnings

To each switch statement in s_texfilter.c, add a break statement to the
default case.

Eliminates the Eclipse static analysis warning: No break at the end of
this case.

Reviewed-by: Brian Paul <brianp@vmware.com>
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
13 years agoRemove windows kernel support code.
José Fonseca [Wed, 9 Nov 2011 07:05:52 +0000 (07:05 +0000)]
Remove windows kernel support code.

Not actively used.

Reviewed-by: Brian Paul <brianp@vmware.com>
13 years agogallium/auxiliary: Remove os_stream.
José Fonseca [Wed, 9 Nov 2011 07:02:27 +0000 (07:02 +0000)]
gallium/auxiliary: Remove os_stream.

XP kernel mode was the only subsystem lacking stdio FILES.

Reviewed-by: Brian Paul <brianp@vmware.com>
13 years agodocs: Removed i965 entry in the source tree listing.
Kai Wasserbäch [Tue, 29 Nov 2011 16:07:06 +0000 (17:07 +0100)]
docs: Removed i965 entry in the source tree listing.

Signed-off-by: Kai Wasserbäch <kai@dev.carbon-project.org>
13 years agodocs: Added item to release notes for 7.12.
Kai Wasserbäch [Tue, 29 Nov 2011 16:07:05 +0000 (17:07 +0100)]
docs: Added item to release notes for 7.12.

Signed-off-by: Kai Wasserbäch <kai@dev.carbon-project.org>
13 years agost/vega: Fix warnings about dllimport attributes on windows.
José Fonseca [Wed, 9 Nov 2011 07:03:46 +0000 (07:03 +0000)]
st/vega: Fix warnings about dllimport attributes on windows.

13 years agoi965g: Delete this driver.
Kai Wasserbäch [Tue, 29 Nov 2011 14:04:58 +0000 (15:04 +0100)]
i965g: Delete this driver.

Never completed, and no plans to do so.

Signed-off-by: Kai Wasserbäch <kai@dev.carbon-project.org>
Signed-off-by: José Fonseca <jfonseca@vmware.com>
13 years agomesa: distinct gl_client_array arrays are gone
Chia-I Wu [Tue, 29 Nov 2011 07:19:28 +0000 (15:19 +0800)]
mesa: distinct gl_client_array arrays are gone

Fix build errors since 762c9766c93697af8d7fbaa729aed118789dbe8e.

Acked-by: Jose Fonseca <jfonseca@vmware.com>
13 years agomesa: Use VERT_ATTRIB_* indexed array in gl_array_object.
Mathias Fröhlich [Mon, 31 Oct 2011 21:23:51 +0000 (22:23 +0100)]
mesa: Use VERT_ATTRIB_* indexed array in gl_array_object.

Replace the distinct struct gl_client_array members in gl_array_object by
an array of gl_client_arrays indexed by VERT_ATTRIB_*.
Renumber the vertex attributes slightly to keep the old semantics of the
distinct array members. Make use of the upper 32 bits in VERT_BIT_*.
Update all occurances of the distinct struct members with the array
equivalents.

Signed-off-by: Mathias Froehlich <Mathias.Froehlich@web.de>
Reviewed-by: Eric Anholt <eric@anholt.net>
13 years agomesa: Make gl_program::InputsRead 64 bits.
Mathias Fröhlich [Mon, 31 Oct 2011 17:32:59 +0000 (18:32 +0100)]
mesa: Make gl_program::InputsRead 64 bits.

Make gl_program::InputsRead a 64 bits bitfield.
Adapt the intel and radeon driver to handle a 64 bits
InputsRead value.

Signed-off-by: Mathias Froehlich <Mathias.Froehlich@web.de>
Reviewed-by: Eric Anholt <eric@anholt.net>
13 years agomesa: Make gl_array_object::_Enabled 64 bits.
Mathias Fröhlich [Mon, 31 Oct 2011 17:26:00 +0000 (18:26 +0100)]
mesa: Make gl_array_object::_Enabled 64 bits.

Signed-off-by: Mathias Froehlich <Mathias.Froehlich@web.de>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
13 years agovbo: Use The VERT_{ATTRIB,BIT} defines.
Mathias Fröhlich [Mon, 31 Oct 2011 15:23:40 +0000 (16:23 +0100)]
vbo: Use The VERT_{ATTRIB,BIT} defines.

Signed-off-by: Mathias Froehlich <Mathias.Froehlich@web.de>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
13 years agomesa: Replace _NEW_ARRAY_* bits with VERT_BIT_*
Mathias Fröhlich [Mon, 31 Oct 2011 14:11:43 +0000 (15:11 +0100)]
mesa: Replace _NEW_ARRAY_* bits with VERT_BIT_*

Consolidate the two distinct set of flags to use VERT_BIT_*.

Signed-off-by: Mathias Froehlich <Mathias.Froehlich@web.de>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
13 years agomesa: Introduce more symbolic VERT_{ATTRIB,BIT}* defines.
Mathias Fröhlich [Mon, 31 Oct 2011 08:31:58 +0000 (09:31 +0100)]
mesa: Introduce more symbolic VERT_{ATTRIB,BIT}* defines.

Introduce a set of defines for VERT_ATTRIB_* and VERT_BIT_*
that will be used in the followup patches.

Signed-off-by: Mathias Froehlich <Mathias.Froehlich@web.de>
Reviewed-by: Eric Anholt <eric@anholt.net>
13 years agomesa: move ElementArrayBufferObj to gl_array_object
Yuanhan Liu [Wed, 23 Nov 2011 07:59:06 +0000 (15:59 +0800)]
mesa: move ElementArrayBufferObj to gl_array_object

According opengl spec 4.2.pdf table 6.12 (Vertex Array Object State) at
page 515, the element buffer object is listed in vertex array object.

So, move the ElementArrayBufferObj inside gl_array_object to make
element buffer object per-vao.

This would fix most of(3 left) intel oglc vao test fail

NOTE: this is a candidate for the 7.11 branch.

Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
13 years agomesa: update comments for _mesa_format_matches_format_and_type(), 80-column wrapping
Brian Paul [Tue, 29 Nov 2011 01:09:14 +0000 (18:09 -0700)]
mesa: update comments for _mesa_format_matches_format_and_type(), 80-column wrapping

13 years agomesa: add component comments for sRGB formats
Brian Paul [Tue, 29 Nov 2011 01:09:14 +0000 (18:09 -0700)]
mesa: add component comments for sRGB formats

13 years agomesa: update texstore comments for R/G textures
Brian Paul [Tue, 29 Nov 2011 01:09:14 +0000 (18:09 -0700)]
mesa: update texstore comments for R/G textures

13 years agomesa: fix comments for RG formats
Brian Paul [Tue, 29 Nov 2011 01:09:14 +0000 (18:09 -0700)]
mesa: fix comments for RG formats

The position of the red and green bits was misstated in the comments.
Arguably, the names of these formats should be changed to "GR" to reflect
the component ordering and to be consistent with other formats.

13 years agost/mesa: don't try to allocate zero-sized renderbuffers
Brian Paul [Tue, 29 Nov 2011 01:00:35 +0000 (18:00 -0700)]
st/mesa: don't try to allocate zero-sized renderbuffers

Fixes https://bugs.freedesktop.org/show_bug.cgi?id=43047
and https://bugs.freedesktop.org/show_bug.cgi?id=43048

Note: This is a candidate for the 7.11 branch.

Tested-by: Vinson Lee <vlee@vmware.com>
Signed-off-by: Brian Paul <brianp@vmware.com>
13 years agogallium/i965g: hide that utterly broken driver better
Daniel Vetter [Mon, 28 Nov 2011 21:24:26 +0000 (22:24 +0100)]
gallium/i965g: hide that utterly broken driver better

And warn loudly in case people want to use it. Too many tester report
gpu hangs on irc and we rootcause this ...

Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
13 years agoswrast: add missing texfetch table entry for MESA_FORMAT_ARGB2101010_UINT
Brian Paul [Mon, 28 Nov 2011 22:03:55 +0000 (15:03 -0700)]
swrast: add missing texfetch table entry for MESA_FORMAT_ARGB2101010_UINT

As with the other integer-valued formats, use NULL until we support
integer textures.

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

Tested-by: Vinson Lee <vlee@vmware.com>
Signed-off-by: Brian Paul <brianp@vmware.com>
13 years agomesa: remove unused gl_texture_object::DriverData field
Brian Paul [Mon, 28 Nov 2011 17:07:19 +0000 (10:07 -0700)]
mesa: remove unused gl_texture_object::DriverData field

13 years agomesa: handle MapTextureImage() failures in mipmap generation code
Brian Paul [Sat, 26 Nov 2011 16:10:54 +0000 (09:10 -0700)]
mesa: handle MapTextureImage() failures in mipmap generation code

And handle potential malloc failures too.

Reviewed-by: Eric Anholt <eric@anholt.net>
13 years agomesa: handle MapTextureImage() failures in glGetTexImage code
Brian Paul [Sat, 26 Nov 2011 16:10:51 +0000 (09:10 -0700)]
mesa: handle MapTextureImage() failures in glGetTexImage code

Reviewed-by: Eric Anholt <eric@anholt.net>
13 years agomesa: handle MapTextureImage() failures in glTexImage code
Brian Paul [Sat, 26 Nov 2011 16:10:47 +0000 (09:10 -0700)]
mesa: handle MapTextureImage() failures in glTexImage code

Reviewed-by: Eric Anholt <eric@anholt.net>
13 years agomesa: fix frag shader generation for alpha test with no color buffers
Brian Paul [Sat, 26 Nov 2011 15:54:57 +0000 (08:54 -0700)]
mesa: fix frag shader generation for alpha test with no color buffers

If alpha test is enabled and there's no color buffers we still need the
fragment shader to emit a color.

v2: add _NEW_COLOR flag in _mesa_update_state_locked()

Fixes piglit fbo-alphatest-nocolor-ff failures with Gallium drivers.

Reviewed-by: Eric Anholt <eric@anholt.net>
Tested-by: Eric Anholt <eric@anholt.net> (i965)
13 years agomesa: check for null ptr in _mesa_is_bufferobj()
Brian Paul [Wed, 23 Nov 2011 22:33:46 +0000 (15:33 -0700)]
mesa: check for null ptr in _mesa_is_bufferobj()

This simplifies a few callers.  And it adds a bit of robustness.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
13 years agomesa: move _mesa_base_format_has_channel() into image.c
Brian Paul [Wed, 23 Nov 2011 22:33:46 +0000 (15:33 -0700)]
mesa: move _mesa_base_format_has_channel() into image.c

This is where other format-related functions live.

Reviewed-by: Eric Anholt <eric@anholt.net>
13 years agomesa: combine GL_TEXTURE_INTENSITY/LUMINANCE_SIZE queries
Brian Paul [Wed, 23 Nov 2011 22:33:46 +0000 (15:33 -0700)]
mesa: combine GL_TEXTURE_INTENSITY/LUMINANCE_SIZE queries

Use the _mesa_base_format_has_channel() helper as we do for the
other texture format component queries.

Reviewed-by: Eric Anholt <eric@anholt.net>
13 years agomesa: use _mesa_base_format_has_channel() in fbobject.c queries
Brian Paul [Wed, 23 Nov 2011 22:33:45 +0000 (15:33 -0700)]
mesa: use _mesa_base_format_has_channel() in fbobject.c queries

Reviewed-by: Eric Anholt <eric@anholt.net>
13 years agomesa: fix indexing error in unpack_Z32_FLOAT_X24S8()
Brian Paul [Wed, 23 Nov 2011 17:36:16 +0000 (10:36 -0700)]
mesa: fix indexing error in unpack_Z32_FLOAT_X24S8()

The source array elements are 8-bytes (float + uint) so we need
to multiply the src index by 2 to get the right array stride.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
13 years agomesa/docs: add ARB_texture_rgb10_a2ui to relnotes/gl3.txt
Dave Airlie [Sun, 27 Nov 2011 16:44:13 +0000 (16:44 +0000)]
mesa/docs: add ARB_texture_rgb10_a2ui to relnotes/gl3.txt

Signed-off-by: Dave Airlie <airlied@redhat.com>
13 years agost/mesa: add ARB_texture_rgb10_a2ui support
Dave Airlie [Sun, 27 Nov 2011 16:23:56 +0000 (16:23 +0000)]
st/mesa: add ARB_texture_rgb10_a2ui support

Add support to the state tracker format and extension enablement code.

Signed-off-by: Dave Airlie <airlied@redhat.com>
13 years agomesa/format: add mesa MESA_FORMAT_ARGB2101010_UINT support.
Dave Airlie [Sun, 27 Nov 2011 16:21:02 +0000 (16:21 +0000)]
mesa/format: add mesa MESA_FORMAT_ARGB2101010_UINT support.

This format is used in the ARB_texture_rgb10_a2ui spec.

It adds core mesa support, texformat + texstore support, format_unpack
and fbobject.c (all patches from list merged + fixed up).

also fixes some whitespace issues.

Parts were:
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
13 years agoimage/pack: fix missing GL_BGR(A)_INTEGER support.
Dave Airlie [Sun, 27 Nov 2011 17:16:27 +0000 (17:16 +0000)]
image/pack: fix missing GL_BGR(A)_INTEGER support.

These codepaths were missing the cases for BGR_INTEGER/BGRA_INTEGER.

Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
13 years agodocs: Add 7.11.2 release notes and news
Ian Romanick [Sun, 27 Nov 2011 22:17:22 +0000 (14:17 -0800)]
docs: Add 7.11.2 release notes and news

13 years agoimage: fix legal types for packed integer formats.
Dave Airlie [Sat, 26 Nov 2011 16:54:29 +0000 (16:54 +0000)]
image: fix legal types for packed integer formats.

After reading ARB_texture_rgb10_a2ui it appears the packed formats
for integer types are only specified via this extension, and not via
the original ones. So condition the checks on this.

Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
13 years agor600g: add framebuffer support for 2/10/10/10 integer
Dave Airlie [Sun, 27 Nov 2011 20:33:37 +0000 (20:33 +0000)]
r600g: add framebuffer support for 2/10/10/10 integer

13 years agor600g: add int support for 2/10/10/10 format.
Dave Airlie [Sun, 27 Nov 2011 16:24:26 +0000 (16:24 +0000)]
r600g: add int support for 2/10/10/10 format.

integer wasn't set properly for the non-uniform types.

Signed-off-by: Dave Airlie <airlied@redhat.com>
13 years agodocs/gl3: these two interfaces are complete now.
Dave Airlie [Sun, 27 Nov 2011 16:44:03 +0000 (16:44 +0000)]
docs/gl3: these two interfaces are complete now.

Signed-off-by: Dave Airlie <airlied@redhat.com>
13 years agopack: fix indentation (trivial)
Dave Airlie [Sun, 27 Nov 2011 17:15:50 +0000 (17:15 +0000)]
pack: fix indentation (trivial)

just saw this while looking for other problems.

Signed-off-by: Dave Airlie <airlied@redhat.com>
13 years agoglapi: add ARB_texture_rgb10_a2ui support.
Dave Airlie [Sun, 27 Nov 2011 16:19:39 +0000 (16:19 +0000)]
glapi: add ARB_texture_rgb10_a2ui support.

This just adds one enum.

regenerate enums.c.

Signed-off-by: Dave Airlie <airlied@redhat.com>
13 years agogallium: add B10G10R10A2_UINT format
Dave Airlie [Sun, 27 Nov 2011 16:18:08 +0000 (16:18 +0000)]
gallium: add B10G10R10A2_UINT format

This format is used for ARB_texture_rgb10_a2ui extension.

Signed-off-by: Dave Airlie <airlied@redhat.com>
13 years agomesa: add MESA_FORMAT_RGBX8888 and MESA_FORMAT_RGBX8888_REV
Chia-I Wu [Tue, 22 Nov 2011 07:05:25 +0000 (15:05 +0800)]
mesa: add MESA_FORMAT_RGBX8888 and MESA_FORMAT_RGBX8888_REV

MESA_FORMAT_RGBX8888_REV is one of the opaque pixel formats used on Android.
Thanks to texture-from-pixmap, drivers may actually see texture images with
this format on Android.

MESA_FORMAT_RGBX8888 is added only for completeness.

Reviewed-by: Brian Paul <brianp@vmware.com>
[olv: Move the new formats after MESA_FORMAT_ARGB8888_REV in gl_format.  I
      accidentally moved them to the wrong place when preparing the patch.]

13 years agoegl_glx: Try first a default lookup for glXGetProcAddress before loading dynamic...
Beren Minor [Fri, 25 Nov 2011 10:58:38 +0000 (11:58 +0100)]
egl_glx: Try first a default lookup for glXGetProcAddress before loading dynamic lib.

GLX functions are sometimes directly available in the current binary. In such
cases, we do not need any alternate library loaded using dlopen. Otherwise,
dlopen may find the wrong libGL library and get functions that conflicts with
the current loaded ones.

For example, on Debian Sid with nvidia binary drivers, using mesa's libEGL with
GLX driver leads to wrong glXGetFBConfigs symbol loaded (or loaded twice?),
which leads to "GLX: failed to create any config" error message as the
glXGetFBConfigs symbol seems to return garbage. If the binary is linked with
nvidia's libGL, the GLX symbols are already available.
Without this patch, convert_fbconfig (src/egl/drivers/glx/egl_glx.c:233) fails
for every config found, after glXGetFBConfigAttrib(... GLX_RENDER_TYPE, ...)
call, as the value returned has GLX_COLOR_INDEX_BIT and not GLX_RGBA_BIT.

[olv: initialize handle, prepend egl_glx to the commit log]

13 years agoandroid: bring in i915_dri and i965_dri automatically
Chia-I Wu [Fri, 25 Nov 2011 12:44:12 +0000 (20:44 +0800)]
android: bring in i915_dri and i965_dri automatically

Add i915_dri and i965_dri to libGLES_mesa's LOCAL_REQUIRED_MODULES when
enabled.

13 years agoandroid: pass -std=c99 by default
Chia-I Wu [Sat, 26 Nov 2011 03:20:05 +0000 (11:20 +0800)]
android: pass -std=c99 by default

Several modules expect a C99 compiler already.  It is also the default for
Makefile build.

13 years agoandroid: move libGLES_mesa build rules to src/egl/main/.
Chia-I Wu [Sat, 26 Nov 2011 03:06:02 +0000 (11:06 +0800)]
android: move libGLES_mesa build rules to src/egl/main/.

Keep the top-level Android.mk away from building modules.

13 years agoandroid: clean up libglapi bulid rules a bit
Chia-I Wu [Sat, 26 Nov 2011 02:28:13 +0000 (10:28 +0800)]
android: clean up libglapi bulid rules a bit

Make the output prettier.  Make the rules reusable if we ever want to add
other modules, such as libGLESv2_mesa.

13 years agost/xa: Kill a couple of compilation warnings
Thomas Hellstrom [Thu, 24 Nov 2011 21:23:37 +0000 (22:23 +0100)]
st/xa: Kill a couple of compilation warnings

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
13 years agost/xa, xa/vmwgfx: Generate exported symbol list from the st/xa symbols.
Thomas Hellstrom [Thu, 24 Nov 2011 20:54:54 +0000 (21:54 +0100)]
st/xa, xa/vmwgfx: Generate exported symbol list from the st/xa symbols.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
13 years agost/xa, xa/vmwgfx: Use XA_EXPORT attribute to indicate global visibility
Thomas Hellstrom [Thu, 24 Nov 2011 20:59:06 +0000 (21:59 +0100)]
st/xa, xa/vmwgfx: Use XA_EXPORT attribute to indicate global visibility

Also fix up Makefiles to use the default mesa compilation flags.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrants <jakob@vmware.com>
13 years agost/xa, xa/vmwgfx: Set the right version on library suffix
Thomas Hellstrom [Thu, 24 Nov 2011 21:01:54 +0000 (22:01 +0100)]
st/xa, xa/vmwgfx: Set the right version on library suffix

Also remove some unused variables in the st/xa makefile.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
13 years agoandroid: add support for ICS
Chia-I Wu [Fri, 25 Nov 2011 03:59:02 +0000 (11:59 +0800)]
android: add support for ICS

With ICS (Android 4.0), several headers and structs are renamed.  Define
ANDROID_VERSION so that we can choose a different path depending on the
platform version.

I've tested only softpipe and llvmpipe.  r600g is also reported to work.

13 years agovbo: fix !FEATURE_beginend build
Chia-I Wu [Tue, 15 Nov 2011 17:07:26 +0000 (10:07 -0700)]
vbo: fix !FEATURE_beginend build

Fix a build error in GLES-only build.

13 years agost/egl: fix a crash in Android backend
Chia-I Wu [Thu, 24 Nov 2011 09:13:15 +0000 (17:13 +0800)]
st/egl: fix a crash in Android backend

There is no buffer and android_surface_present should be a no-op when
eglSwapBuffers is called twice in a row.

13 years agosoftpipe: s/int/unsigned/ to be consistent in alpha test code
Brian Paul [Wed, 23 Nov 2011 22:03:47 +0000 (15:03 -0700)]
softpipe: s/int/unsigned/ to be consistent in alpha test code

13 years agosoftpipe: remove pointless break stmt
Brian Paul [Wed, 23 Nov 2011 22:02:05 +0000 (15:02 -0700)]
softpipe: remove pointless break stmt