Commit Graph

47647 Commits

Author SHA1 Message Date
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
Benjamin Franzke 31156c07b0 st/dri/sw: Fix incorrect cast
Missed one casting error due to rebase for commit
98aa2a8f72.
2011-11-02 15:56:23 +01:00
Benjamin Franzke 98aa2a8f72 st/dri/sw: Implement texture_from_pixmap
This is a cleanup of commit 02f1b50987.

Update tex buffer using a dri_drawable hook from implemented in sw/drisw.c.
This saves us the duplication of dri_drawable.c.

CC: Stuart Abercrombie <sabercrombie@chromium.org>
CC: Stéphane Marchesin <marcheu@chromium.org>
2011-11-02 15:43:27 +01:00
Benjamin Franzke 0a2afcb754 Revert "Duplicate state_tracker/dri/sw/dri_drawable.c"
This reverts commit 569bde1fa7.

CC: Stuart Abercrombie <sabercrombie@chromium.org>
CC: Stéphane Marchesin <marcheu@chromium.org>
2011-11-02 15:43:26 +01:00
Benjamin Franzke 5da7c5e364 Revert "state_trackers/dri/sw: Implement texture_from_pixmap."
This reverts commit 02f1b50987.

CC: Stuart Abercrombie <sabercrombie@chromium.org>
CC: Stéphane Marchesin <marcheu@chromium.org>
2011-11-02 15:43:26 +01:00
Alex Deucher 0a2c4889cb r600g: add comment about special shader exports
Certain exports (position, point size, etc.) are treated
specially by the shader and not counted as generic exports.

Note the exports and any relevant related state bits.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
2011-11-02 09:47:40 -04:00
Vadim Girlin 16c0a3a972 r600g: take into account PSIZE output for spi mapping
Skip PSIZE and POSITION when counting VS outputs.
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=42435

Tested without regressions on evergreen.

NOTE: this is a candidate for the 7.11 branch.

Signed-off-by: Vadim Girlin <vadimgirlin@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
2011-11-02 09:47:10 -04:00
José Fonseca e8f646fa7e svga: Update state prototypes to return pipe_error.
Fixes a bunch of prototype mismatch warnings..
2011-11-02 11:18:35 +00:00
Jeremy Huddleston 666c70ce8e Build fix for -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-11-01 21:04:51 -07:00