Commit graph

47455 commits

Author SHA1 Message Date
Chia-I Wu
db73264e14 mesa: add GL_OES_EGL_image_external to the extension list
Reviewed-by: Brian Paul <brianp@vmware.com>
Acked-by: Jakob Bornecrantz <jakob@vmware.com>
2011-11-03 15:09:44 +08:00
Chia-I Wu
1b1af84149 mesa: add missing defines for GL_OES_EGL_image_external
Reviewed-by: Brian Paul <brianp@vmware.com>
Acked-by: Jakob Bornecrantz <jakob@vmware.com>
2011-11-03 15:09:44 +08:00
Chia-I Wu
1ab1b15e9d mesa, i965: prepare for more than 8 texture targets
3-bit fields are used store texture target in several places.  That will fail
when TEXTURE_EXTERNAL_INDEX, which happends to be the 9th texture target, is
added.  Make them 4-bit fields.

Reviewed-by: Brian Paul <brianp@vmware.com>
Acked-by: Jakob Bornecrantz <jakob@vmware.com>
2011-11-03 15:09:44 +08:00
Chia-I Wu
833d707db1 glapi: regenerate files 2011-11-03 15:09:43 +08:00
Chia-I Wu
6e093935bb glapi: add entry points for OES_EGL_image_external
Only enums actually.

Reviewed-by: Brian Paul <brianp@vmware.com>
Acked-by: Jakob Bornecrantz <jakob@vmware.com>
2011-11-03 15:09:43 +08:00
Chia-I Wu
61e81851be GLES: upgrade glext.h to revision 13240
Reviewed-by: Brian Paul <brianp@vmware.com>
Acked-by: Jakob Bornecrantz <jakob@vmware.com>
2011-11-03 15:09:43 +08:00
Yuanhan Liu
9f7b6a39f6 swrast: simplify the condition test for _swrast_choose_texture_sample_func
remove another long if condition test. I don't feel a strong need of
this patch. But for it make the code a little simpler(I do think so),
I send it out.

Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
2011-11-03 10:24:28 +08:00
Yuanhan Liu
49f8447acc mesa: fix the low limit of width and height for glRenderbufferStorage
glRenderbufferStorage man page says:

  GL_INVALID_VALUE is generated if either of width or height is negative,
  or greater than the value of GL_MAX_RENDERBUFFER_SIZE.

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>
2011-11-03 10:22:56 +08:00
Yuanhan Liu
1f5bd65efa mesa: fix inital value for new renderbuffer
EXT_framebuffer_object bspec says:

    Get Value                          Type    Get Command 		Initial Value
    -------------------------------    ------  -----------      	-----------
    RENDERBUFFER_INTERNAL_FORMAT_EXT   Z+     GetRenderbufferParameterivEXT  RGBA

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>
2011-11-03 10:22:15 +08:00
Yuanhan Liu
77cd3bf18d mesa: complete the GL_TEXTURE_SWIZZLE* setup
The ARB_texture_swizzle spec says:
    The error INVALID_OPERATION is generated if TexParameteri,
    TexParameterf, TexParameteriv, or TexParameterfv, parameter <pname>
    is TEXTURE_SWIZZLE_R, TEXTURE_SWIZZLE_G,  TEXTURE_SWIZZLE_B,
    or TEXTURE_SWIZZLE_A, and <param> is not RED, GREEN, BLUE, ALPHA,
    ZERO, or ONE.

    The error INVALID_OPERATION is generated if TexParameteriv, or
    TexParameterfv, parameter <pname> TEXTURE_SWIZZLE_RGBA, and the four
    consecutive values pointed to by <param> are not all RED, GREEN, BLUE,
    ALPHA, ZERO, or ONE.

So, the GL_TEXTURE_SWIZZLE* pname is legal for glTexParameterf(v)

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>
2011-11-03 10:19:49 +08:00
Yuanhan Liu
d9f05ac828 mesa: remove the redundant check
Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
2011-11-03 10:18:58 +08:00
Carl-Philip Haensch
34a5598d86 driconf: updated german translation 2011-11-02 14:28:19 -07:00
Carl-Philip Haensch
997a477d0c driconf: updated de.po 2011-11-02 14:28:19 -07:00
Morgan Armand
c7fc4067eb wglSetPixelFormat should ignore the ppfd parameter.
Signed-off-by: José Fonseca <jfonseca@vmware.com>
2011-11-02 19:51:09 +00:00
Michel Dänzer
0be1f79770 r300g: Fix queries on big endian hosts.
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Corbin Simpson <MostAwesomeDude@gmail.com>
2011-11-02 18:59:30 +01:00
Michel Dänzer
4a3be16fd2 gallium/util: Add macros for converting from little endian to CPU byte order.
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
2011-11-02 18:24:09 +01:00
Paul Berry
29e2bc8b13 i965: Add support for integral vertex attributes.
When a vertex shader input attribute is declared with an integral type
(e.g. ivec4), we need to ensure that the generated vertex shader code
addresses the vertex attribute register using the proper register
type.  (Previously, we assumed all vertex shader input attributes were
floating-point).

In addition, when uploading vertex data that was specified with
VertexAttribIPointer, we need to instruct the vertex fetch unit to
convert the data to signed or unsigned int, rather than float.  And
when filling in the implied w=1 on a vector with less than 4
components, we need to fill it in with the integer representation of 1
rather than the floating-point representation of 1.

Fixes piglit tests vs-attrib-{ivec4,uvec4}-precision.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2011-11-02 09:29:35 -07:00
Paul Berry
8f84c237b3 mesa: Set the "Integer" field of gl_client_array properly.
This patch ensures that gl_client_array::Integer is properly set to
GL_TRUE for vertex attributes specified using glVertexAttribIPointer,
and to GL_FALSE for vertex attributes specified using
glVertexAttribPointer, so that the vertex attributes can be
interpreted properly by driver back-ends.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
2011-11-02 09:29:35 -07:00
Paul Berry
9abda92b27 glsl: Fix type mismatch when incrementing or decrementing uint.
When converting an expression like "++x" to GLSL IR we were failing to
account for the possibility that x might be an unsigned integral type.
As a result the user would receive a bogus error message "Could not
implicitly convert operands to arithmetic operator".

Fixes piglit tests {vs,fs}-{increment,decrement}-uint.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2011-11-02 09:28:54 -07:00
José Fonseca
a0d8e5d12a gallium/dri: Remove references to vblank. 2011-11-02 16:16:50 +00:00
Kristian Høgsberg
d14a107158 Fix gallium dri compile and a merge conflict 2011-11-02 12:01:46 -04:00
Jakob Bornecrantz
292c21bfdc svga: Tag cursors with the scanout hint
Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
2011-11-02 16:22:57 +01:00
Kristian Høgsberg
8b65c33eb8 dri: Remove unused memops.h 2011-11-02 11:16:04 -04:00
Kristian Høgsberg
6c26d998ef dri: Remove a few unused dri helper functions 2011-11-02 11:16:03 -04:00
Kristian Høgsberg
2e53f3018f dri: Remove unused dri texmem.c 2011-11-02 11:16:03 -04:00
Kristian Høgsberg
c2711cdfb6 dri: Move _dri_texformat_* to radeon_texture.c
They are only used by the r200 driver now.
2011-11-02 11:16:03 -04:00
Kristian Høgsberg
1ca2e84921 r200: Don't use driIsTextureResident helper
With DRI2, textures are always resident and using the DRI texmem helper
here is broken anyway, since nothing else uses it.
2011-11-02 11:16:03 -04:00
Kristian Høgsberg
a14bb89d3f dri: Drop unused dri renderbuffer helper functions 2011-11-02 11:16:03 -04:00
Kristian Høgsberg
c467db4cc7 dri: Move driUpdateFramebufferSize to dri_util.c
drirenderbuffer.[ch] is going bye-bye.
2011-11-02 11:16:03 -04:00
Kristian Høgsberg
90de3b9d96 dri: Remove unnecessary #defines and #includes 2011-11-02 11:16:02 -04:00
Kristian Høgsberg
e9beaf65fd dri: Remove unnecessary timestamp pointer indirection 2011-11-02 11:16:02 -04:00
Kristian Høgsberg
e8ed01f693 dri: Remove unused fields from __DriverAPIRec 2011-11-02 11:16:02 -04:00
Kristian Høgsberg
03855bc2ac dri: Remove dri2.enabled flag
DRI2 is always enabled now.
2011-11-02 11:16:01 -04:00
Kristian Høgsberg
a2ea34d705 dri: Remove DRI1 fields from DRI structs 2011-11-02 11:16:01 -04:00
Kristian Høgsberg
1837fb8e7c dri: Remove remaining DRI1 vblank code 2011-11-02 11:16:01 -04:00
Kristian Høgsberg
d24b81e0e0 dri: Remove cliprect information from __DRIdrawable 2011-11-02 11:16:00 -04:00
Kristian Høgsberg
24002daf01 dri: Drop unused driCalculateSwapUsage 2011-11-02 11:16:00 -04:00
Kristian Høgsberg
8e6c22136f dri: Remove unused driIntersectArea 2011-11-02 11:15:59 -04:00
Kristian Høgsberg
bfb6f9e690 dri: Drop __driUtilUpdateDrawableInfo and helper macros 2011-11-02 11:15:59 -04:00
Kristian Høgsberg
6260618b29 dri: Remove unused driSwapBuffers 2011-11-02 11:15:59 -04:00
Kristian Høgsberg
e78f7b8b44 dri: Drop unused driCreateNewContext 2011-11-02 11:15:58 -04:00
Kristian Høgsberg
f5ba7662bd dri: Fold driCreateNewDrawable into dri2CreateNewDrawable 2011-11-02 11:15:58 -04:00
Kristian Høgsberg
c786debe98 dri: Remove unsused driCreateNewScreen 2011-11-02 11:15:58 -04:00
Kristian Høgsberg
d02bd705fb dri: Remove unused __DRIswapInfoRec 2011-11-02 11:15:57 -04:00
Kristian Høgsberg
73ec71cb16 dri: Remove driMediaStreamCounterExtension
Also DRI1-only.
2011-11-02 11:15:57 -04:00
Kristian Høgsberg
759cbb751b dri: Remove driSwapControlExtension
DRI1-only as well.
2011-11-02 11:15:57 -04:00
Kristian Høgsberg
8e898e83c6 dri: Drop driCopySubBufferExtension
Another DRI1-only extension.
2011-11-02 11:15:56 -04:00
Kristian Høgsberg
ad32215871 dri: Drop driReadDrawableExtension
All DRI2 drivers support setting a separate read drawable.
2011-11-02 11:15:56 -04:00
Kristian Høgsberg
3203912600 dri: Drop driLegacyExtension
There are no DRI1 drivers left.
2011-11-02 11:15:56 -04:00
George Sapountzis
0c425ac18c st/dri/sw: add get_image inline helper similar to put_image
TODO: check if GetImage works with passing the pitch as width, similar to PutImage,
which avoids the extra copy, ala dri_sw_displaytarget_display() in src/gallium/winsys/sw/dri/dri_sw_winsys.c
2011-11-02 17:07:59 +02:00