Mesa (gles3): 117 new commits
Matt Turner
mattst88 at kemper.freedesktop.org
Thu Jan 10 19:19:26 UTC 2013
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2e562dfea179bd546f859fd3cef7bf0a96f7da5a
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Tue Jan 8 11:23:10 2013 -0800
mesa: Use GL_RED for DEPTH_TEXTURE_MODE for everything but legacy GL.
According to page 163 of the ES 3.0 spec:
"Texture lookups involving textures with depth component data generate
a texture base color C_b either using depth data directly or by
performing a comparison with the D_ref value used to perform the
lookup, as described in section 3.8.15. The resulting value R_t is
then expanded to a color C_b = (R_t,0,0,1), ..."
In other words, depth textures are supposed to be treated as GL_RED.
A discussion about this text can be found in Khronos bugzilla:
https://cvs.khronos.org/bugzilla/show_bug.cgi?id=7962
It's unclear what the behavior of desktop GL should be. The GL 3.x
specifications indicate that it should be (r, r, r, 1), which is
GL_LUMINANCE (the old default). However, page 112 of the 4.2 core
specification contains the text quoted above, explicitly declaring it
to be (R_t, 0, 0, 1), which is GL_RED.
So it hinges on whether the 4.2 text is a change or a clarification.
Personally I think that using GL_RED in core contexts and GL_INTENSITY
in legacy contexts seems reasonable.
Fixes 4 es3conform tests:
- depth_texture_fbo
- depth_texture_fbo_clear
- depth_texture_teximage
- depth_texture_texsubimage
Cc: Ian Romanick <idr at freedesktop.org>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=707349f2bd91a0b1a25d8b55a08015e30f9ad026
Author: Jordan Justen <jordan.l.justen at intel.com>
Date: Thu Dec 27 12:34:03 2012 -0800
texformat: use MESA_FORMAT_ARGB2101010 with GL_UNSIGNED_INT_2_10_10_10_REV
Choose MESA_FORMAT_ARGB2101010 when storing
GL_RGBA + GL_UNSIGNED_INT_2_10_10_10_REV or
GL_RGB + GL_UNSIGNED_INT_2_10_10_10_REV.
Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f67235e9d666dab11d6f7735eabf2e6ad579b636
Author: Jordan Justen <jordan.l.justen at intel.com>
Date: Wed Jan 2 22:32:47 2013 -0800
texstore argb2101010: merge GL_RGBA and GL_RGB cases
Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1d27e074485f7d7082d55495f4fc4a4369242ae4
Author: Jordan Justen <jordan.l.justen at intel.com>
Date: Sun Dec 30 00:40:00 2012 -0800
pack: handle GL_RGB+GL_UNSIGNED_INT_2_10_10_10_REV case
For floats, if GL_RGB is the source, then alpha should be set to
1.0F.
Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=331958ab834f88ca105d6071ae6eaa06f5eca757
Author: Jordan Justen <jordan.l.justen at intel.com>
Date: Fri Dec 28 11:46:06 2012 -0800
i965 teximage: allocate texture image buffer for fallback path
Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9e2ddc3a97c4b18a6a7ff0a4d7706e7313161a25
Author: Jordan Justen <jordan.l.justen at intel.com>
Date: Fri Dec 28 11:45:04 2012 -0800
i965 teximage: don't call _mesa_store_teximage if format/type==GL_NONE
Mesa core's copyteximage calls the driver with format/type==GL_NONE
to "Allocate texture memory". In this case, we shouldn't call
_mesa_store_teximage.
Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fce09a9bd0b665621fb48402f181ab99cd6f7369
Author: Jordan Justen <jordan.l.justen at intel.com>
Date: Fri Dec 28 11:37:23 2012 -0800
glformats: allow GL_RGB+GL_UNSIGNED_INT_2_10_10_10_REV for GLES2/3
This format is allowed by the GL_EXT_texture_type_2_10_10_10_REV
extension.
Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2fa24d8eb829553624d115f1e77ce782fba3e992
Author: Jordan Justen <jordan.l.justen at intel.com>
Date: Fri Jan 4 12:29:02 2013 -0800
readpix: for implentation format/type, ignore int vs. non-int check
In ES or GL+GL_ARB_ES2_compatibility, the usage of
format = IMPLEMENTATION_COLOR_READ_FORMAT +
type = IMPLEMENTATION_COLOR_READ_TYPE
can function, even if the src/dst int vs. non-int types
differ.
Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=90f0e3fe8dc59bcbf3227c0ebdb4080e6a0db47c
Author: Jordan Justen <jordan.l.justen at intel.com>
Date: Fri Dec 28 11:27:04 2012 -0800
readpix: raise priority of FBO completeness error
GTF/gles3 test suite wants this error to have higher priority
than the type checking.
Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6af1f3801689abbcab0fa853969b3199a49aa33d
Author: Jordan Justen <jordan.l.justen at intel.com>
Date: Fri Dec 28 11:24:37 2012 -0800
readpix: add error checking for GLES3
Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=354caea038770a2eafc0e91059d8ddae7864be83
Author: Jordan Justen <jordan.l.justen at intel.com>
Date: Fri Dec 28 11:16:15 2012 -0800
readpix: use integer conversion for RGBA/UNSIGNED_BYTE
If the source read buffer is integer based, and the the read
pixels type is RGBA/UNSIGNED_BYTE, then use the integer pixel
conversion path.
Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fe948f174b334bb6b04f7b9758af9509bb660219
Author: Jordan Justen <jordan.l.justen at intel.com>
Date: Fri Dec 28 11:08:20 2012 -0800
glformats: support _mesa_bytes_per_pixel for 2101010+GL_RGB
Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=13eb3e90f61b7a024d23a4230320caadce8e836a
Author: Jordan Justen <jordan.l.justen at intel.com>
Date: Fri Dec 28 11:07:01 2012 -0800
copytexture: update error checking for GLES3
Changes based on GTF/gles3 conformance test suite.
Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9a1e0261cda258d4c4887a4a5f3f755b73be4dc1
Author: Jordan Justen <jordan.l.justen at intel.com>
Date: Fri Dec 28 11:00:50 2012 -0800
copytexture: make sure is_srgb(src) == is_srgb(dst)
Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=575349da9c65a0c8df64d65746c6e0ead93e19f8
Author: Jordan Justen <jordan.l.justen at intel.com>
Date: Fri Dec 28 10:55:33 2012 -0800
framebuffer: add _mesa_get_read_renderbuffer
This returns the current read renderbuffer for the specified
format type.
Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=042d3a6b412d7ad4670622c4c0e7a02a03725625
Author: Jordan Justen <jordan.l.justen at intel.com>
Date: Thu Dec 27 17:36:10 2012 -0800
copytexture: for GLES make sure integer signed vs. unsigned matches
Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ce9c1d3f77838ce01b03b61bbb86f0a22d84c4fd
Author: Jordan Justen <jordan.l.justen at intel.com>
Date: Thu Dec 27 16:45:13 2012 -0800
glformats: add _mesa_base_format_component_count
Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2f17eb644d5be9f869ea4fc382a51086d498de0b
Author: Matt Turner <mattst88 at gmail.com>
Date: Thu Dec 6 14:51:29 2012 -0800
teximage: use _mesa_es3_error_check_format_and_type for GLES3
Reviewed-by: Jordan Justen <jordan.l.justen at intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6dd62def9d7efc78c30a879bdbe7dd8bbe21592b
Author: Matt Turner <mattst88 at gmail.com>
Date: Thu Dec 6 14:51:29 2012 -0800
glformats: add _mesa_es3_error_check_format_and_type
This function checks for ES3 compatible
format/type/internalFormat/dimension combinations.
[jordan.l.justen at intel.com: additional tweaks for gles3-gtf]
Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=52a8c143cd2687e43f8b4b1c9768920a722b5143
Author: Jordan Justen <jordan.l.justen at intel.com>
Date: Thu Dec 27 13:34:44 2012 -0800
fbobject: add additional fbo completeness checks for GLES
Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1b982a84c82f0866d98746e4019afe34c14a6747
Author: Jordan Justen <jordan.l.justen at intel.com>
Date: Thu Dec 27 13:24:57 2012 -0800
glformats: add functions to detect signed/unsigned integer types
Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c6f40d09f32a422b2bcf0f0394b487bbcc714ccd
Author: Jordan Justen <jordan.l.justen at intel.com>
Date: Thu Dec 27 13:21:01 2012 -0800
unpack: support unpacking MESA_FORMAT_ARGB2101010
Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3a86031176a528269400d15e012929ee54388a95
Author: Jordan Justen <jordan.l.justen at intel.com>
Date: Thu Dec 27 13:18:09 2012 -0800
pack: adjust clamping for int=>ubyte conversion
gles3conform expects than when converting from a signed
int to an unsigned byte, the output will be clamped at a
max of 0x7f. This impacts conversion from
int16_t => uint8_t and int32_t => uint8_t.
Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8b7ff0d442df9431c1bc0557a6e8e080b2d4bf67
Author: Jordan Justen <jordan.l.justen at intel.com>
Date: Thu Dec 27 12:41:10 2012 -0800
fbobject: don't allow LUMINANCE/INTENSITY/ALPHA fbo on GLES
Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9028cd65ff291a5cc345a326f51f1b43cf902525
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Tue Dec 18 12:32:29 2012 -0800
Fix-up for "mesa: Rework crazy error code rules in glDrawBuffers()."
This should be squashed into the earlier patch when mailing it out for
review or merging it to master.
The error path was missing a "return" like all the other error paths.
Also, we may as well call it glDrawBuffers in the error message since
the ARB suffix doesn't exist in ES 3.
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ae913ed48fe4342d5648f49c0d34db7db934a754
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Fri Aug 17 18:09:09 2012 -0700
i965: Don't maintain programs for ff state when there is no ff
NOTE: This is a candidate for the 9.0 branch.
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c7560d81c389ff02651f167d32509ef348e49906
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Fri Aug 17 18:08:39 2012 -0700
mesa: Don't muck about with ff state when there is no ff
NOTE: This is a candidate for the 9.0 branch.
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=80d9e7171f192f9b59340baa907e4fe1df15e006
Author: Chad Versace <chad.versace at linux.intel.com>
Date: Tue Nov 20 13:43:11 2012 -0800
egl/dri2: Add plumbing for EGL_OPENGL_ES3_BIT_KHR
Fixes error EGL_BAD_ATTRIBUTE in the tests below on Intel Sandybridge:
* piglit egl-create-context-verify-gl-flavor, testcase OpenGL ES 3.0
* gles3conform, revision 19700, when runnning GL3Tests with -fbo
This plumbing is added in order to comply with the EGL_KHR_create_context
spec. According to the EGL_KHR_create_context spec, it is illegal to call
eglCreateContext(EGL_CONTEXT_MAJOR_VERSION_KHR=3) with a config whose
EGL_RENDERABLE_TYPE does not contain the EGL_OPENGL_ES3_BIT_KHR. The
pertinent
portion of the spec is quoted below; the key word is "respectively".
* If <config> is not a valid EGLConfig, or does not support the
requested client API, then an EGL_BAD_CONFIG error is generated
(this includes requesting creation of an OpenGL ES 1.x, 2.0, or
3.0 context when the EGL_RENDERABLE_TYPE attribute of <config>
does not contain EGL_OPENGL_ES_BIT, EGL_OPENGL_ES2_BIT, or
EGL_OPENGL_ES3_BIT_KHR respectively).
To create this patch, I searched for all the ES2 bit plumbing by calling
`git grep "ES2_BIT\|DRI_API_GLES2" src/egl`, and then at each location
added a case for ES3.
Signed-off-by: Chad Versace <chad.versace at linux.intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6934db5836f5f0cf4159a36c51a93bb6e30155d8
Author: Chad Versace <chad.versace at linux.intel.com>
Date: Wed Nov 21 16:55:43 2012 -0800
intel: Expose support for DRI_API_GLES3
If the hardware/driver combo supports GLES3, then set the GLES3 bit in
intel_screen's bitmask of supported DRI API's. Neither the EGL nor GLX
layer uses the bit yet.
Signed-off-by: Chad Versace <chad.versace at linux.intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=93adc4da6bbd69358d9a0f4421fce0abe1c2870b
Author: Chad Versace <chad.versace at linux.intel.com>
Date: Tue Nov 20 13:27:14 2012 -0800
dri: Define enum __DRI_API_GLES3
This enum corresponds to EGL_OPENGL_ES3_BIT_KHR.
Neither the GLX nor EGL layer use the enum yet.
I don't like the GLES bits. I'd prefer that all GLES APIs be exposed
through a single API bit, as is done in GLX_EXT_create_context_es_profile.
But, we need this GLES3 enum in order to do the plumbing necessary to
correctly support EGL_OPENGL_ES3_BIT_KHR as required by the
EGL_KHR_create_context spec.
Signed-off-by: Chad Versace <chad.versace at linux.intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=91c1be0a625c51a31ad9f6dd80727d1b52fda789
Author: Chad Versace <chad.versace at linux.intel.com>
Date: Wed Nov 21 16:22:19 2012 -0800
intel: Move validation of context version into intelInitContext
Each driver (i830, i915, i965) used independent but similar code to
validate the requested context version. With the rececnt arrival of GLES3,
that logic has needed an update. Rather than apply identical updates to
each drivers validation code, let's just move the validation into the
shared routine intelInitContext.
This refactor required some incidental changes to functions
i830CreateContext and intelInitContext. For each function, this patch:
- Adds context version parameters to the signature.
- Adds a DRI_CTX_ERROR out param to the signature.
- Sets the DRI_CTX_ERROR at each early return.
Tested against gen6 with piglit egl-create-context-verify-gl-flavor.
Verified that this patch does not change the set of exposed EGL context
flavors.
Signed-off-by: Chad Versace <chad.versace at linux.intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=baa745c44d9890e399d8e904422987196550a7d4
Author: Chad Versace <chad.versace at linux.intel.com>
Date: Wed Nov 21 15:08:27 2012 -0800
intel: Set screen's api mask according to hw capabilities (v3)
Before this patch, intelInitScreen2 set DRIScreen::api_mask with the hacky
heuristic below:
if (gen >= 3)
api_mask = GL | GLES1 | GLES2;
else
api_mask = 0;
This hack was likely broken on gen2 (i830), but I don't care enough to
properly investigate. It appears that every EGLConfig on i830 has
EGL_RENDERABLE_TYPE=0, and thus eglCreateContext will never succeed.
Anyway, moving on to living drivers...
With the arrival of EGL_OPENGL_ES3_BIT_KHR, this heuristic is now
insufficient. We must enable the GLES3 bit if and only if the driver is
capable of creating a GLES3 context. This requires us to determine the
maximum supported context version supported by the hardware/driver for
each api *during initialization of intel_screen*.
Therefore, this patch adds four new fields to intel_screen which indicate
the maximum supported context version for each api:
max_gl_core_version
max_gl_compat_version
max_gl_es1_version
max_gl_es2_version
The api mask is now correctly set as:
api_mask = GL;
if (max_gl_es1_version > 0)
api_mask |= GLES1;
if (max_gl_es2_version > 0)
api_mask |= GLES2;
Tested against gen6 with piglit egl-create-context-verify-gl-flavor.
Verified that this patch does not change the set of exposed EGL context
flavors.
v2:
- Replace the if-tree on gen with a switch, for Ian.
- Unconditionally enable the DRI_API_OPENGL bit, for Ian.
v3:
- Drop max gl version to 1.4 on gen3 if !has_occlusion_query,
because occlusion queries entered core in 1.5. For Ian.
Signed-off-by: Chad Versace <chad.versace at linux.intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick.intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cae15090aadff5450bfc5754557edefe53a1c33e
Author: Chad Versace <chad.versace at linux.intel.com>
Date: Wed Nov 21 09:28:36 2012 -0800
i965: Bump maximum supported ES2 context version to 3.0
Since patch "i965: Validate requested GLES context version in
brwCreateContext", we have been able to create ES 3.0 contexts due to the
max version check. So...bump the max version.
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Signed-off-by: Chad Versace <chad.versace at linux.intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e0e1d0e40822d3f845d4ea5b9e83e4fe7ebda55c
Author: Paul Berry <stereotype441 at gmail.com>
Date: Tue Aug 7 12:39:30 2012 -0700
i965/Gen6+: Enable ARB_ES3_compatibility extension
IMPORTANT: this patch should not be pushed to master until ES3 support
is fully implemented on i965/Gen6+.
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9ec61a5ee1c92d8a3bd81e934f5239f07a3a40eb
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Fri Nov 9 10:23:30 2012 -0800
i965: Add support for GL_ANY_SAMPLES_PASSED_CONSERVATIVE
We just treat this as an alias for GL_ANY_SAMPLES_PASSED.
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6a9224e258b59e189b8606f83644e3a7c53b40a7
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Wed Aug 8 15:25:00 2012 -0700
mesa/es3: Enable ES 3.0 API and shading language version
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=03236cefd1eddf5a6816b8f85974ce7a87c32697
Author: Matt Turner <mattst88 at gmail.com>
Date: Tue Nov 27 12:18:02 2012 -0800
glcpp: Reject token pasting operator in GLES
The GLSL ES 3.0 spec (Section 12.17) says:
"GLSL ES 1.00 removed token pasting and other functionality."
NOTE: This is a candidate for the stable branches.
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Carl Worth <cworth at cworth.org>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a1845ba8a171b6a4e4ded498a09a37a5532bb454
Author: Carl Worth <cworth at cworth.org>
Date: Mon Nov 26 15:00:05 2012 -0800
glcpp: Make undefined macros illegal in #if and #elif for GLES3
Simply emitting a nicely-formatted error message if any undefined macro is
encountered in a parser context expecting an expression.
With this commit, the following piglit test now passes:
spec/glsl-es-3.00/compiler/undefined-macro.vert
Reviewed-by: Matt Turner <mattst88 at gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=22538bf1943a5acf83c38e6ed854c444fa5d4227
Author: Carl Worth <cworth at cworth.org>
Date: Mon Nov 26 14:53:54 2012 -0800
glcpp: Add a flag to the parser state to indicate GLES.
This can be triggered either by creation of a GLES context (with
api == API_OPENGLES2) or else by a #version directive with version
value 100 or with a string of "es" following the version value.
There's no behavioral change with this commit—just preparation for ES-specific
behavior in the preprocessor in the future.
Reviewed-by: Matt Turner <mattst88 at gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a46df75bf6eeb00963c14976758a11d0a3e2a5e1
Author: Matt Turner <mattst88 at gmail.com>
Date: Fri Nov 30 15:07:54 2012 -0800
mesa: Return INVALID_ENUM for glReadPixels(..., GL_DEPTH_*, ...) on ES 3
I'm not sure if this is the correct fix. The
_mesa_es_error_check_format_and_type function (used above in the ES 1
and 2 cases) was originally added for glTexImage checking and allows
GL_DEPTH_STENCIL/GL_UNSIGNED_INT_24_8 combinations. Using it in ES 3
causes other tests to regress.
Fixes es3conform's packed_depth_stencil_error test.
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org> (v1)
Reviewed-by: Anuj Phogat <anuj.phogat at gmail.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f085df26e6e8310e2d3ee3abbdb9d061bf915825
Author: Matt Turner <mattst88 at gmail.com>
Date: Fri Nov 30 15:07:18 2012 -0800
mesa: Return INVALID_OPERATION when type is known but not allowed
INVALID_ENUM is for when the type is simply not known.
Fixes part of es3conform's packed_depth_stencil_error test.
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a21b091000613173748e6b5fdc8260fa5ae10911
Author: Matt Turner <mattst88 at gmail.com>
Date: Fri Nov 30 11:10:20 2012 -0800
mesa: Use _mesa_lookup_enum_by_nr in tex*_error_check
Reviewed-by: Brian Paul <brianp at vmware.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cb2e9dfe7fbc5447da388b80b7dbdab0d04f11aa
Author: Matt Turner <mattst88 at gmail.com>
Date: Wed Nov 28 21:45:19 2012 -0800
mesa: Allow HALF_FLOAT in glVertexAttribPointer
Fixes es3conform's half_float_max_vertex_dimensions and
half_float_textures tests.
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b22a575c3bf5db9d29dea717c7cc58e8bed87848
Author: Matt Turner <mattst88 at gmail.com>
Date: Tue Nov 20 13:45:03 2012 -0800
mesa: Reject texture-only formats as renderbuffer formats in ES 3
ES 3 specifies some formats as texture-only (i.e., not available for
renderbuffers).
See the "Required Texture Formats" section (pg 126) of the ES 3 spec.
Fixes es3conform's color_buffer_unsupported_format test.
Acked-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Anuj Phogat <anuj.phogat at gmail.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=80e2f63c0d6880c054d3b05598b1c7691ef90ce1
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Sat Nov 17 21:23:28 2012 -0800
mesa: Fix default value of BUFFER_ACCESS_FLAGS.
According to both the GL 3.0 and ES 3.0 specifications (table 2.7 for GL
and table 2.8 for ES), the default value of BUFFER_ACCESS_FLAGS is
supposed to be zero.
Note that there are two related quantities: the obsolete BUFFER_ACCESS
enum and the new BUFFER_ACCESS_FLAGS bitfield.
BUFFER_ACCESS can only be GL_READ_ONLY, GL_WRITE_ONLY, or GL_READ_WRITE;
BUFFER_ACCESS_FLAGS can easily represent all three via GL_MAP_WRITE_BIT,
GL_MAP_READ_BIT, and their logical or. It also supports more flags.
Thus, Mesa only stores the bitfield, and simply computes the old enum
when queried, via simplified_access_mode(bufObj->AccessFlags).
The tricky part is that, while BUFFER_ACCESS_FLAGS defaults to 0,
BUFFER_ACCESS defaults to GL_READ_WRITE for desktop [GL 3.0, table 2.8]
and GL_WRITE_ONLY_OES for ES [the GL_EXT_map_buffer_range extension].
Mesa tried to implement this by setting the default AccessFlags to
GL_MAP_READ_BIT | GL_MAP_WRITE_BIT on desktop, and GL_MAP_WRITE_BIT on
ES. But in all specifications, it needs to be 0.
This patch moves that logic into simplified_access_mode(): when
AccessFlags == 0, it now returns GL_READ_WRITE for desktop and
GL_WRITE_ONLY for ES 1/2. (BUFFER_ACCESS doesn't exist on ES 3.0,
so it's irrelevant there.)
With that in place, it changes the AccessFlags default to 0.
Fixes three es3conform tsets:
- copy_buffer_defaults
- map_buffer_range_modify_indices
- pixel_buffer_object_default_parameters
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=421aa22077fb94c06c590dff17ea4b59f3916ac5
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Fri Nov 16 14:52:01 2012 -0800
mesa: Rework crazy error code rules in glDrawBuffers().
Perhaps most importantly, this patch adds comments quoting the relevant
spec paragraphs above each error condition.
It also makes three changes:
- For FBOs, GL_COLOR_ATTACHMENTm where m >= MaxDrawBuffers is supposed
to generate INVALID_OPERATION (not INVALID_ENUM).
- Constants that refer to multiple buffers (such as FRONT, BACK, LEFT,
RIGHT, and FRONT_AND_BACK) are supposed to generate INVALID_OPERATION,
not INVALID_ENUM.
- In ES 3.0, for FBOs, buffers[i] must be NONE or GL_COLOR_ATTACHMENTi
or else INVALID_OPERATION occurs. (This is a new restriction.)
Fixes es3conform's draw-buffers-api test.
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5fe874d468bbe8e43ee00a8d279aece5a343cb78
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Fri Aug 10 22:28:27 2012 -0700
mesa/es3: Add support for GL_PRIMITIVE_RESTART_FIXED_INDEX
This requires some derived state. The cut vertex used is either the
value specified by glPrimitiveRestartIndex or it's hard-coded to ~0.
The derived state gl_array_attrib::_RestartIndex captures this value.
In addition, the derived state gl_array_attrib::_PrimitiveRestart is set
whenever either gl_array_attrib::PrimitiveRestart or
gl_array_attrib::PrimitiveRestartFixedIndex is set.
v2: Use _mesa_is_gles3.
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=68a9b93f8070d3629e8c49daf11b3f3cb8ae1038
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Fri Aug 10 21:38:21 2012 -0700
mesa/es3: Add support for GL_ANY_SAMPLES_PASSED_CONSERVATIVE query target
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a354f6b702f7c79f3874a009e0937f2389889081
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Wed Aug 8 13:11:32 2012 -0700
mesa/es3: Allow transpose matrix uniforms in GLES3
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0ae81b8422e272e44ef40a09dc443c9014adbd0b
Author: Matt Turner <mattst88 at gmail.com>
Date: Tue Nov 20 13:01:04 2012 -0800
mesa: Rename and wire-up GetInteger64i_v
The function was named badly and wasn't in the dispatch table,
making it hard to find.
Fixes transform_feedback2_states and gets a few other transform
feedback tests closer to working in es3conform.
Reviewed-by Anuj Phogat <anuj.phogat at gmail.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1a3ffbf3789777a174158ba75472b07a6270ba9d
Author: Matt Turner <mattst88 at gmail.com>
Date: Tue Nov 20 12:56:52 2012 -0800
mesa: Correct glGet{Boolean,Integer}i_v names
Reviewed-by Anuj Phogat <anuj.phogat at gmail.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ec8ee91923b13f972f5f7cf0573e7c412bf2de05
Author: Matt Turner <mattst88 at gmail.com>
Date: Thu Nov 15 22:13:48 2012 -0800
mesa: Allow GL_DEPTH_STENCIL_ATTACHMENT in ES 3
Fixes framebuffer_srgb_default_encoding_fbo and 5 packed_depth_stencil
tests from es3conform.
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=75b963c095d28e1a1b31753142e2d5f934b62f79
Author: Chad Versace <chad.versace at linux.intel.com>
Date: Tue Nov 20 17:04:45 2012 -0800
mesa: Support more glGet enums for ES3
For glGetIntegerv, add support for the following in an OpenGL ES 3.0
context:
GL_MAJOR_VERSION
GL_MINOR_VERSION
GL_NUM_EXTENSIONS
See Table 6.29 of the OpenGL ES 3.0 spec.
Fixes error GL_INVALID_ENUM in piglit egl-create-context-verify-gl-flavor,
testcase for OpenGL ES 3.0.
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org> (v1)
Reviewed-by: Matt Turner <mattst88 at gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Signed-off-by: Chad Versace <chad.versace at linux.intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=532e05a9d094fdcdeb2c8dfd0bec6eab82dc8163
Author: Matt Turner <mattst88 at gmail.com>
Date: Sat Dec 8 17:24:19 2012 -0800
mesa: Support querying GL_MAX_ELEMENT_INDEX in ES 3
The ES 3 spec says that the minumum allowable value is 2^24-1, but the
GL 4.3 and ARB_ES3_compatibility specs require 2^32-1, so return 2^32-1.
Fixes es3conform's element_index_uint_constants test.
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=92855727f1e0ce1a9861e8f7b6c3ca2b6ffbe440
Author: Matt Turner <mattst88 at gmail.com>
Date: Sat Dec 8 17:17:19 2012 -0800
mesa: De-duplicate ES2 queries
From GL/GLES/GL_CORE and GLES2 -> GL/GL_CORE/GLES2.
Yes, we really were exposing ES2_compatibility queries on ES 1.
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5bb1827d9537c6fca438baeae68eb097dcb44a65
Author: Matt Turner <mattst88 at gmail.com>
Date: Sat Dec 8 17:10:50 2012 -0800
mesa: Allow glGet* queries on EXT_texture_lod_bias data in ES 3
Fixes the remaining 4 texture_lod_bias failures in es3conform.
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e895d368e1ed8765255816560e5dede90db57f10
Author: Matt Turner <mattst88 at gmail.com>
Date: Sat Dec 8 17:04:42 2012 -0800
mesa: Allow glGet* queries on EXT_framebuffer_blit data in ES 3
Fixes 2 framebuffer_blit es3conform tests.
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d9948e49d3c107ea05ca7277cdd440877cdf45fe
Author: Matt Turner <mattst88 at gmail.com>
Date: Sat Dec 8 17:03:44 2012 -0800
mesa: Allow glGet* queries on ARB_fragment/vertex_shader data in ES 3
Fixes uniform_buffer_object_implementation_dependent_limits in
es3conform.
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d93c1b62f8382590b9051f4657a8a8b207f460de
Author: Matt Turner <mattst88 at gmail.com>
Date: Sat Dec 8 17:02:26 2012 -0800
mesa: Allow glGet* queries on ARB_framebuffer_object data in ES 3
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=914415a63f7a77dcd346cec114db58e225e20467
Author: Matt Turner <mattst88 at gmail.com>
Date: Sat Dec 8 17:01:42 2012 -0800
mesa: Allow glGet* queries on ARB_transform_feedback2 data in ES 3
Fixes the transform_feedback2_init_defaults test from es3conform.
The ES 3 spec lists these as TRANSFORM_FEEDBACK_PAUSED and
TRANSFORM_FEEDBACK_ACTIVE.
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3d0e4eb1347edd78a8524ad1320f0486367f826d
Author: Matt Turner <mattst88 at gmail.com>
Date: Sat Dec 8 17:00:57 2012 -0800
mesa: Allow glGet* queries on EXT_transform_feedback data in ES 3
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3f1217607ab8fcbba36b3f6a9f1e1b4820379f81
Author: Matt Turner <mattst88 at gmail.com>
Date: Sat Dec 8 17:00:17 2012 -0800
mesa: Allow glGet* queries on ARB_sync data in ES 3
Fixes the sync_coverage_max_server_wait_timeout test in es3conform.
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0a8866e75157edf1be473b198d6e461f6e1dc421
Author: Matt Turner <mattst88 at gmail.com>
Date: Sat Dec 8 16:59:37 2012 -0800
mesa: Allow glGet* queries of EXT_pbo data in ES 3
Fixes pixel_buffer_object_default_binding and gets other tests in
es3conform closer to passing.
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=be68dae3747360b29a53f70af8e347c2436ec3ec
Author: Matt Turner <mattst88 at gmail.com>
Date: Sat Dec 8 16:43:54 2012 -0800
mesa: Allow glGet* queries of select ARB_ubo data in ES 3
Fixes 5 uniform_buffer_object tests in es3conform.
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0cc018526f610deb4990587a6d1ac73d5d71bc90
Author: Matt Turner <mattst88 at gmail.com>
Date: Fri Dec 14 14:22:28 2012 -0800
Add ES 3 handling to get.c and get_hash_generator.py
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=57616159aae308e1a8fa831c57958f649a934650
Author: Matt Turner <mattst88 at gmail.com>
Date: Wed Nov 28 12:03:26 2012 -0800
glapi: Move ARB_base_instance to the correct location
It's #107, it shouldn't be added after the #116 comment.
Reviewed-by: Fredrik Höglund <fredrik at kde.org>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a5ed966069daf328277b98149c5361f48b225d61
Author: Matt Turner <mattst88 at gmail.com>
Date: Thu Nov 29 12:43:39 2012 -0800
mesa/tests: Add ARB_ES3_compatibility enums
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=910a0bfe5b3e41411d15636ac7cc0e6de7972661
Author: Matt Turner <mattst88 at gmail.com>
Date: Wed Nov 28 12:12:09 2012 -0800
glapi: Add enums for ARB_ES3_compatibility
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c5e9396424bb470ec55a2a29e3ef95aa76fed738
Author: Quentin Glidic <sardemff7+git at sardemff7.net>
Date: Wed Nov 28 16:33:47 2012 +0100
mesa/program: Fix both Classic and Gallium build
Follow-up for 907844107252260c646aca361191ef7f121f3d23 and
3a5ad21cd3f026579eeacc25b39513711556c7ee
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=57044
Tested-by: Fabio Pedretti <fabio.ped at libero.it>
Tested-by: Brad King <brad.king at kitware.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f416b382d6ec4db0621b9a8d7225201da895b367
Author: Andreas Boll <andreas.boll.dev at gmail.com>
Date: Tue Nov 27 10:25:54 2012 +0100
configure.ac: fix typo in error message
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2f89949b666889a61196657511b1dee4418ae865
Author: Marek Olšák <maraeo at gmail.com>
Date: Thu Jan 10 15:23:56 2013 +0100
r300g: don't set sample positions to the pixel center if MSAA is disabled
but an MSAA resource is bound. This effectively makes the MSAA disable switch
not affect rasterization, but it still affects the alpha-to-one and
alpha-to-coverage states. This hardware just lacks a proper MSAA disable
switch.
This fixes graphics corruption in sauerbraten.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=59194
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9a07b6bd747e776aa55029e18ab11d3b8569ee61
Author: Paul Berry <stereotype441 at gmail.com>
Date: Tue Jan 8 13:30:46 2013 -0800
intel: Clean up confusion between logical and physical surface dimensions.
In most cases, the width, height, and depth of the physical surface
used by the driver to implement a texture or renderbuffer is equal to
the logical width, height, and depth exposed to the client through
functions such as glTexImage3D(). However, there are two exceptions:
cube maps (which have a physical depth of 6 but a logical depth of 1)
and multisampled renderbuffers (which have larger physical dimensions
than logical dimensions to allow multiple samples per pixel).
Previous to this patch, we accounted for the difference between
physical and logical surface dimensions at inconsistent places in the
call graph (multisampling was accounted for in
intel_miptree_create_for_renderbuffer(), and cubemaps were accounted
for in intel_miptree_create_internal()). As a result, it wasn't
always clear, when calling a miptree creation function, whether
physical or logical dimensions were needed. Also, we weren't
consistent about storing logical dimensions in the intel_mipmap_tree
structure (we only did so in the
intel_miptree_create_for_renderbuffer() code path, and we did not
store depth).
This patch refactors things so that intel_miptree_create_internal() is
responsible for converting logical to physical dimensions and for
storing both the physical and logical dimensions in the
intel_mipmap_tree structure. As a result, all miptree creation
functions interpret their arguments as logical dimensions, and both
physical and logical dimensions are always available to functions that
work with intel_mipmap_trees.
In addition, it renames the fields in intel_mipmap_tree used to store
the dimensions, so that it is clear from the name whether physical or
logical dimensions are being referred to.
This should fix the following bugs:
- When creating a separate stencil surface for a depthstencil cubemap,
we would erroneously try to convert the depth from 1 to 6 twice,
resulting in an assertion failure.
- When creating an MCS buffer for compressed multisampling, we used
physical dimensions instead of logical dimensions, resulting in
wasted memory.
In addition, this should considerably simplify the implementation of
ARB_texture_multisample, because it moves the code to compute the
physical size of multisampled surfaces out of renderbuffer-only code.
Reviewed-by: Chris Forbes <chrisf at ijw.co.nz>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Chad Versace <chad.versace at linux.intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a5f87e88437e9e27d59e1ec875986ff445d991be
Author: Paul Berry <stereotype441 at gmail.com>
Date: Tue Jan 8 13:12:09 2013 -0800
intel: Add a force_y_tiling parameter to intel_miptree_create().
This allows intel_miptree_alloc_mcs() to force Y tiling for the MCS
buffer. Previously we accomplished this by the hack of passing
INTEL_MSAA_LAYOUT_CMS as the msaa_layout parameter, but that parameter
is going to be going away soon.
Reviewed-by: Chris Forbes <chrisf at ijw.co.nz>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Chad Versace <chad.versace at linux.intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8f15f19696dceac2eafe7f5ed3e4c491165f3fca
Author: Paul Berry <stereotype441 at gmail.com>
Date: Tue Jan 8 13:00:25 2013 -0800
intel: Move compute_msaa_layout earlier in file.
No functional change. This patch moves the compute_msaa_layout()
function earlier in intel_mipmap_tree.c so that it can be used by
other functions in that file.
Reviewed-by: Chris Forbes <chrisf at ijw.co.nz>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Chad Versace <chad.versace at linux.intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b37930f309a2e04f242a171152cb7c6c4300266a
Author: Vinson Lee <vlee at freedesktop.org>
Date: Wed Jan 9 08:09:00 2013 +0100
r600g: Fix memory leak in r600_bytecode_add_vtx.
Fixes resource leak defect reported by Coverity.
Signed-off-by: Vinson Lee <vlee at freedesktop.org>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f8651dea4e4aa12a2a4aa287d45b7495f146af37
Author: Marek Olšák <maraeo at gmail.com>
Date: Wed Jan 9 16:39:18 2013 +0100
r300g: optionally log MSAA resources to stderr
Set: RADEON_DEBUG=msaa
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1385c353cf06c6156d574cffba6164f2b59739e6
Author: Marek Olšák <maraeo at gmail.com>
Date: Wed Jan 9 16:26:24 2013 +0100
r300g: fix the GPU name in the renderer string
Broken by ca474f98f2cda5cb333e9f851.
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4f2d9a8f520cda5bf7af9b8e659f247c753211af
Author: Marek Olšák <maraeo at gmail.com>
Date: Wed Jan 9 11:34:33 2013 +0100
r300g: fix CS checker errors caused by emit_dsa_state
size is 10 on r500 and 8 on r300
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=959e83d65075513f989cb1fe634dca314a7e185f
Author: Johannes Obermayr <johannesobermayr at gmx.de>
Date: Fri Nov 30 01:44:56 2012 +0100
clover: Adapt libclc's INCLUDEDIR and LIBEXECDIR to make use of the new introduced libclc.pc.
Tom Stellard:
-Keep --with-libclc-path and mark it deprecated.
Reviewed-by: Tom Stellard <thomas.stellard at amd.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ed3f237e09a42bdb55afb58d1536affad9000d76
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Thu Dec 6 14:57:01 2012 -0800
glsl: Don't add structure fields to the symbol table
I erroneously added this back in January 2011 in commit 88421589.
Looking at the commit message, I have no idea why I added it. It only
added non-array structure fields to the symbol table, so array structure
fields are treated correctly.
Fixes piglit tests structure-and-field-have-same-name.vert and
structure-and-field-have-same-name-nested.vert. It should also fix
WebGL conformance tests shader-with-non-reserved-words.
NOTE: This is a candidate for the stable release branches.
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=57622
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a5265f7536538ca9af770ef90262c836a324dbc0
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Mon Jan 7 19:42:38 2013 -0800
i965/fs: Fix struct vs. class in acp_entry definitions.
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a70e5e2b94194da3f4102a9f8e3c8ed5ca6dd8b8
Author: Marek Olšák <maraeo at gmail.com>
Date: Sat Dec 22 19:33:47 2012 +0100
r600g: implement buffer copying using CP DMA for R7xx, Evergreen, Cayman
R6xx doesn't work - the issue seems to be with flushing (sometimes
the destination buffer contains garbage). There are no hangs, so we're good.
R7xx doesn't seem to have any alignment restriction despite our initial
thinking. Everything just works.
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2d3d0d3a5ae3829260f914462f4e63b2ff4aadbc
Author: Marek Olšák <maraeo at gmail.com>
Date: Tue Jan 8 20:39:55 2013 +0100
st/mesa: fix possible MSVC build error v2
https://bugs.freedesktop.org/show_bug.cgi?id=59143
Using GLubyte as per Brian's suggestion.
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c35abcd1b0d0e0059c60781bd21558872020553d
Author: Paul Berry <stereotype441 at gmail.com>
Date: Tue Dec 18 16:37:52 2012 -0800
glsl: Pack flat "varyings" of mixed types together.
This patch enhances the varying packing code so that flat varyings of
uint, int, and float types can be packed together.
We accomplish this in lower_packed_varyings.cpp by making the type of
all flat varyings ivec4, and then using information-preserving type
conversions (e.g. ir_unop_bitcast_f2i) to convert all other types to
ints.
The varying_matches::compute_packing_class() function is updated to
reflect the fact that varying packing no longer needs to segregate
varyings of different base types.
Fixes piglit test varying-packing-mixed-types.
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
v2: Split lower_packed_varyings_visitor::bitwise_assign into
pack/unpack variants.
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=18720555dd2da779ad6907e8f6aa083e7b4d1841
Author: Paul Berry <stereotype441 at gmail.com>
Date: Tue Dec 18 15:24:39 2012 -0800
glsl: Prohibit structs and bools from being used as "varyings".
The GLSL 1.30 spec only allows vertex shader outputs and fragment
shader inputs ("varyings" in pre-GLSL-1.30 parlance) to be of type
int, uint, float, or vectors, matrices, or arrays thereof. Bools,
bvec's, and structs are prohibited. (Integral varyings were
prohibited prior to GLSL 1.30).
Previously, Mesa only performed this check on variables declared with
the "varying" keyword, and it always performed the check according to
the pre-GLSL-1.30 rules. As a result, bools and structs were allowed
to slip through, provided they were declared using the new in/out
syntax.
This patch modifies the error check so that it occurs after "varying"
is converted to "in/out", and corrects it to properly account for GLSL
version.
Fixes piglit tests:
in-bool-prohibited.frag
in-bvec2-prohibited.frag
in-bvec3-prohibited.frag
in-bvec4-prohibited.frag
in-struct-prohibited.frag
out-bool-prohibited.vert
out-bvec2-prohibited.vert
out-bvec3-prohibited.vert
out-bvec4-prohibited.vert
out-struct-prohibited.vert
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c33be485c58dace2a691042703f50cc6defe960d
Author: Paul Berry <stereotype441 at gmail.com>
Date: Tue Dec 18 14:49:34 2012 -0800
glsl: Plumb through is_parameter to apply_type_qualifier_to_variable()
This patch adds logic to allow the ast_to_hir function
apply_type_qualifier_to_variable() to tell whether it is acting on a
variable declaration or a function parameter. This will allow it to
correctly interpret the meaning of "out" and "in" keywords (which have
different meanings in those two contexts).
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4b11b57ab47b98b335a7212080dbccef04542805
Author: Paul Berry <stereotype441 at gmail.com>
Date: Mon Dec 17 14:20:35 2012 -0800
glsl: Separate varying linking code to its own file.
linker.cpp is getting pretty big, and we're about to add even more
varying packing code, so split out the linker code that concerns
varyings to its own file.
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8706395f25228d0e622cc56346c7181ba102edf4
Author: Paul Berry <stereotype441 at gmail.com>
Date: Mon Dec 17 13:48:21 2012 -0800
mesa: Add ALIGN() macro to main/macros.h.
Previously this macro existed in 3 separate places, some inside the
intel driver and some outside of it. It makes more sense to have it
in main/macros.h
Reviewed-by: Brian Paul <brianp at vmware.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=09df6bb96d5d7b987de6cd48d87d175e5cd2ccf3
Author: Paul Berry <stereotype441 at gmail.com>
Date: Mon Jan 7 18:10:30 2013 -0800
glsl: Fix loop bounds detection.
When analyzing a loop where the loop condition is expressed in the
non-standard order (e.g. "4 > i" instead of "i < 4"), we were
reversing the condition incorrectly, leading to a loop bound that was
off by 1.
Fixes piglit tests {vs,fs}-loop-bounds-unrolled.shader_test.
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Matt Turner <mattst88 at gmail.com>
Reviewed-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=844d14ebee3522281252da03615ac96df7440610
Author: Marek Olšák <maraeo at gmail.com>
Date: Tue Jan 8 16:38:10 2013 +0100
winsys/radeon: bump the size of relocation hashlist
This should reduce the number of hash collisions in ETQW.
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=18f3f7b95898e7db20cdb24181bc24f91cc24fe6
Author: Christoph Bumiller <e0425955 at student.tuwien.ac.at>
Date: Mon Jan 7 15:46:31 2013 +0100
nvc0: catch too high GENERIC indices to prevent GRAPH traps
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b9c8a98e216f4613dc0a40e26d08f2c1cb760e76
Author: Christoph Bumiller <e0425955 at student.tuwien.ac.at>
Date: Mon Jan 7 22:12:28 2013 +0100
nvc0: use correct resource target to select blit shader
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=41e105d5beb78c42993a602cc58d0f990739b088
Author: Christoph Bumiller <e0425955 at student.tuwien.ac.at>
Date: Mon Jan 7 20:18:06 2013 +0100
nvc0: add missing call to map edge flag in push_vbo
Note: this is a candidate for the 9.0 stable branch.
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=be75a9373a6d0f9e2ef35ac376a541e60d72d306
Author: Christoph Bumiller <e0425955 at student.tuwien.ac.at>
Date: Mon Jan 7 15:50:19 2013 +0100
nv50/ir: wrap assertion using typeid in #ifndef NDEBUG
Note: this is a candidate for the 9.0 stable branch.
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=076f4ced8b7bbf2074cf932e653b1da6db2e2380
Author: Christoph Bumiller <e0425955 at student.tuwien.ac.at>
Date: Tue Jan 8 13:46:24 2013 +0100
nvc0: fix out of bounds writes for unaligned sizes in push_data
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=39fe03e2de655aee9939cb51d08cac8aa491bb6e
Author: Christoph Bumiller <e0425955 at student.tuwien.ac.at>
Date: Tue Jan 8 12:35:25 2013 +0100
nouveau: increase max order of suballocated buffers by 1
This is really a hack to make TF2 (considerably, up to 20 -> 70 fps
at low res) faster.
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=48a45ec24ae74c00d1487552e94d9f824a428f58
Author: Christoph Bumiller <e0425955 at student.tuwien.ac.at>
Date: Tue Jan 8 16:13:11 2013 +0100
nouveau: improve buffer transfers
Save double memcpy on uploads to VRAM in most cases.
Properly handle FLUSH_EXPLICIT.
Reallocate on DISCARD_WHOLE_RESOURCE to avoid sync.
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a75ddfd55d24363046f11b2fd2de25563698fa39
Author: Marek Olšák <maraeo at gmail.com>
Date: Tue Jan 8 14:32:41 2013 +0100
r300g: fix assertion failure in emit_dsa_state
Broken by 8ed6b1400bc8a78f46340f41aaf2e88b24c23267.
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a60c567fcf29f5d2a41222a8826fee2cb0eb4458
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Fri Jan 4 07:53:12 2013 -0800
i965: Support GL_FIXED and packed vertex formats natively on Haswell+.
Haswell and later support the GL_FIXED and 2_10_10_10_rev vertex formats
natively, and don't need shader workarounds.
Reviewed-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e219764fde839754ae2e7e4354697c62a23502ea
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Fri Jan 4 07:53:11 2013 -0800
i965: Add #defines for GL_FIXED vertex formats.
Reviewed-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f3840b16328429ac06f4d60fdf2b350b19f5a481
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Fri Jan 4 07:53:10 2013 -0800
i965: Add remaining #defines for packed vertex formats.
Reviewed-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=899017fc54c40c969b5239b33f3a17b311878b0d
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Fri Jan 4 07:53:09 2013 -0800
i965: Use Haswell's sample_d_c for textureGrad with shadow samplers.
The new hardware actually just supports this now.
Reviewed-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=30f8f58c2035dc7a14cf44d0d9af87dfb9256e96
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Sun Jan 6 23:35:22 2013 -0800
i965/fs: Remove dead code from generate_uniform_pull_constant_load_gen7.
generate_uniform_pull_constant_load_gen7() is only called on Gen7+, so
the gen < 6 code is dead.
Reviewed-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=23595aa427073d876b828646e973be5b28cb5676
Author: Alexander von Gluck IV <kallisti5 at unixzen.com>
Date: Sun Jan 6 16:09:35 2013 -0600
mesa: Drop mmx optimizations on Haiku
* Prevents compatibility problems. As Haiku
doesn't use rtasm anymore, it's kind of
pointless.
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b9227b3e15d8e8d4e6e96efbad940a32c0853c19
Author: Alexander von Gluck IV <kallisti5 at unixzen.com>
Date: Sun Jan 6 16:06:37 2013 -0600
mesa: Don't use rtasm for Haiku swrast
* We have a symbol conflict as rtasm in
Mesa collides with rtasm in gallium.
* As us linking gallium and mesa together
is an edge case, lets just omit the rtasm
code from Mesa as we should be going
llvmpipe soon :)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4332f6fc185f968e7563e748b8c949021937c935
Author: Alex Deucher <alexander.deucher at amd.com>
Date: Mon Jan 7 15:21:46 2013 -0500
r600g: set the virtual address for the htile buffer
Fixes cayman and TN with htile enabled. Should fix:
https://bugs.freedesktop.org/show_bug.cgi?id=59089
https://bugs.freedesktop.org/show_bug.cgi?id=58667
Possibly others.
Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ca474f98f2cda5cb333e9f851c7e0e31c9a6f823
Author: Jerome Glisse <jglisse at redhat.com>
Date: Fri Jan 4 16:34:52 2013 -0500
radeon/winsys: move radeon family/class identification to winsys
Upcoming async dma support rely on winsys knowing about GPU families.
Signed-off-by: Jerome Glisse <jglisse at redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
Reviewed-by: Marek Olšák <maraeo at gmail.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d499ff98cd69c9ec6c43ad8ececa4c3b61889ab9
Author: Jerome Glisse <jglisse at redhat.com>
Date: Fri Jan 4 11:46:13 2013 -0500
r600g/radeon/winsys: indentation cleanup
Signed-off-by: Jerome Glisse <jglisse at redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
Reviewed-by: Marek Olšák <maraeo at gmail.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=afec10df373f342f058aab66c622237964a4a147
Author: Marek Olšák <maraeo at gmail.com>
Date: Sun Jan 6 20:28:03 2013 +0100
r600g: flush FMASK and CMASK at the end of CS
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8ed6b1400bc8a78f46340f41aaf2e88b24c23267
Author: Marek Olšák <maraeo at gmail.com>
Date: Sat Jan 5 06:21:49 2013 +0100
r300g: implement MSAA
This is not as optimized as r600g - the MSAA compression is missing,
so r300g needs a lot of bandwidth (more than r600g to do the same thing).
However, if the bandwidth is not an issue for you, you can enjoy this
unoptimized MSAA support.
The only other missing optimization for MSAA is the fast color clear.
MSAA is enabled on r500 only, because that's the only GPU family I tested.
That said, MSAA should work on r300 and r400 as well (but you must set
RADEON_MSAA=1 to allow it, then turn MSAA on in your app or set GALLIUM_MSAA=n,
n >= 2, n <= 6)
I will enable the support by default on r300-r400 once someone (other than me)
tests those chipsets with piglit.
The supported modes are 2x, 4x, 6x.
The supported MSAA formats are RGBA8, BGRA8, and RGBA16F (r500 only).
Those 3 formats are used for all GL internal formats.
Tested with piglit. (I have ported all MSAA tests to GL2.1)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cc030da4284b6c965d2b72c68a875b3210a4b286
Author: Marek Olšák <maraeo at gmail.com>
Date: Sun Jan 6 01:47:24 2013 +0100
r300g: simplify DSA state, add ability to patch FG_ALPHA_FUNC while emitting
Preparation for MSAA and alpha-to-coverage.
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=25b3c0a52cb0834d683b99e141305424ea5695b6
Author: Marek Olšák <maraeo at gmail.com>
Date: Sun Jan 6 00:31:55 2013 +0100
r300g/compiler: add shader emulation for the alpha_to_one state
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2f358feda311570610729658cfc2897090c14327
Author: Vinson Lee <vlee at freedesktop.org>
Date: Mon Dec 31 15:19:43 2012 -0800
configure.ac: Remove space after indent -T flag.
Fixes this build error on platforms not using GNU indent.
indent: Command line: ``-T'' requires a parameter
Signed-off-by: Vinson Lee <vlee at freedesktop.org>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d299ef3ad0bb6beb7f75331d601c693ae2585232
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Fri Nov 30 14:29:49 2012 -0800
intel: Fix copy-and-paste bug setting gl_constants::MaxSamples
gl_constants::MaxSamples is an integer, so setting it to 1.0 is just
silly.
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Chris Forbes <chrisf at ijw.co.nz>
Reviewed-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a86d629799a45ddc8cde94e9304283fc1858c679
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Mon Dec 3 11:55:12 2012 -0800
mesa: Disallow R, RG, or RGB integer and unsigned formats in OpenGL ES 3.0
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Marek Olšák <maraeo at gmail.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2aae3abd77dc28b3666bb0db04baff18d8f0aa51
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Tue Dec 4 10:36:10 2012 -0800
mesa: Disallow SNORM formats for renderbuffers in OpenGL ES
v2: Move {RED,RG,RGB,RGBA}_SNORM changes from the previous commit to
this commit. Based on suggestions from Ken.
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Marek Olšák <maraeo at gmail.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4b92379da213c85998643997deef945b6e7fb7a7
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Sat Dec 1 11:06:48 2012 -0800
mesa: Disallow deprecated SNORM formats for renderbuffers
The OpenGL 3.2 core profile spec says:
"The following base internal formats from table 3.11 are
color-renderable: RED, RG, RGB, and RGBA. The sized internal formats
from table 3.12 that have a color-renderable base internal format
are also color-renderable. No other formats, including compressed
internal formats, are color-renderable."
The OpenGL 3.2 compatibility profile spec says (only ALPHA is added):
"The following base internal formats from table 3.16 are
color-renderable: ALPHA, RED, RG, RGB, and RGBA. The sized internal formats
from table 3.17 that have a color-renderable base internal format
are also color-renderable. No other formats, including compressed
internal formats, are color-renderable."
Table 3.12 in the core profile spec and table 3.17 in the compatibility
profile spec list SNORM formats as having a base internal format of RED,
RG, RGB, or RGBA. From this we infer that they should also be color
renderable.
The OpenGL ES 3.0 spec says:
"An internal format is color-renderable if it is one of the formats
from table 3.12 noted as color-renderable or if it is unsized format
RGBA or RGB. No other formats, including compressed internal
formats, are color-renderable."
In the OpenGL ES 3.0 spec, none of the SNORM formats have "color-
renderable" marked in table 3.12. The RGB I and UI formats also are not
color-renderable in ES3, but we'll save that change for another patch.
Both NVIDIA's closed-source driver (version 304.64) and AMD's
closed-source driver (Catalyst 12.6 on HD 3650) reject *all* SNORM
formats for renderbuffers in OpenGL 3.3 compatibility profiles.
v2: Move {RED,RG,RGB,RGBA}_SNORM changes from the this commit to the
next commit. Based on suggestions from Ken.
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Marek Olšák <maraeo at gmail.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Eric Anholt <eric at anholt.net>
More information about the mesa-commit
mailing list