Jarkko Pöyry [Sat, 25 Apr 2015 00:56:13 +0000 (17:56 -0700)]
DO NOT MERGE: Do not spam activity manager if remote dies.
- Cache isRunning the first time the process is observed dead.
- Avoid busy-polling the log file in DeqpInstrumentation.
Change-Id: Ie4d042cfef261c42ddc24dfaf9d58c13de867b9d
(cherry picked from commit
dbe1a448db4f68b80f7ce36b95b8f8a3024df3b4)
Jarkko Pöyry [Wed, 6 May 2015 21:32:51 +0000 (21:32 +0000)]
Merge "Add missing EGLimage stencil image verifier." into mnc-dev
Pyry Haulos [Wed, 6 May 2015 21:32:06 +0000 (21:32 +0000)]
Merge "Improve glFlush() & glFinish() tests" into mnc-dev
Jarkko Pöyry [Wed, 6 May 2015 21:22:43 +0000 (21:22 +0000)]
Merge "Fix EGLImage depth image test issues." into mnc-dev
Mika Isojärvi [Wed, 6 May 2015 21:17:48 +0000 (21:17 +0000)]
Merge "Remove copies from rendebuffers from must pass list." into mnc-dev
Mika Isojärvi [Wed, 6 May 2015 21:09:19 +0000 (21:09 +0000)]
Merge "Remove SRGB copy image test bug from test issues list." into mnc-dev
Pyry Haulos [Wed, 6 May 2015 20:32:39 +0000 (13:32 -0700)]
Improve glFlush() & glFinish() tests
* Use tcu::warmupCPU() instead of simple busy wait for warmup.
* Ensure that wait time is always longer than estimated render time.
Change-Id: I891771d41a9bd48e58ad493f4b4dc7f28c571c30
Jarkko Pöyry [Wed, 6 May 2015 20:30:03 +0000 (20:30 +0000)]
Merge "Do not use color EGLimages as depth or stencil images or vice versa." into mnc-dev
Jarkko Pöyry [Wed, 6 May 2015 20:29:47 +0000 (20:29 +0000)]
Merge "Fix some warnings in border clamp tests." into mnc-dev
Jarkko Pöyry [Wed, 6 May 2015 20:24:00 +0000 (13:24 -0700)]
Add missing EGLimage stencil image verifier.
- Add stencil buffer verifier.
- Avoid adding new tests to mustpass.
Bug:
20638016
Change-Id: I8dbeb51b8dfb4392b3fa4216772308ec9e450cb4
Jarkko Pöyry [Wed, 6 May 2015 03:12:24 +0000 (20:12 -0700)]
Fix EGLImage depth image test issues.
- Fix reversed depth compare in reference image generation.
- Set probe plane z coordinates in clip space.
- Use depth mask to avoid probe planes from altering the result.
- Clear fb color before rendering probe planes.
- Use proper threshold when reading a RGB4 fb.
- Initialize RBOs to a nice pattern instead of a single value.
- Don't render from images in multicontext cases before creating it.
Bug:
20637957
Change-Id: I158e51489ab8d562e74066b8549f5ee5a0d90cb7
Jarkko Pöyry [Wed, 6 May 2015 19:06:00 +0000 (12:06 -0700)]
Fix some warnings in border clamp tests.
Change-Id: I66d0bb08f9fc7d6a3b0a49e8866523d0d36bc61c
Mika Isojärvi [Wed, 6 May 2015 18:28:51 +0000 (11:28 -0700)]
Remove copies from rendebuffers from must pass list.
Bug:
20698928
Change-Id: Ia5fbf5ae7ff738522b79b8ee58122afb26c1090a
Mika Isojärvi [Wed, 6 May 2015 18:17:15 +0000 (11:17 -0700)]
Remove SRGB copy image test bug from test issues list.
Bug:
19897810
Change-Id: I3d42fc5c02efcff5784457f98869a2676c3d8249
Pyry Haulos [Wed, 6 May 2015 18:34:07 +0000 (18:34 +0000)]
Merge "Regenerate EGL mustpass lists" into mnc-dev
Pyry Haulos [Wed, 6 May 2015 18:30:55 +0000 (11:30 -0700)]
Regenerate EGL mustpass lists
Change-Id: Ic957f2692ffb176c1a267fe3548b408cebef55f5
Pyry Haulos [Wed, 6 May 2015 18:27:57 +0000 (11:27 -0700)]
Update ES2 mustpass based on latest feedback
Change-Id: Ia640c6bd001165099d1ec6af20739871e654a0e1
Jarkko Pöyry [Wed, 6 May 2015 02:48:45 +0000 (19:48 -0700)]
Do not use color EGLimages as depth or stencil images or vice versa.
Bug:
20638016
Bug:
20637957
Change-Id: I43fe93e80c9c8955889815743509ae4901be17a3
Pyry Haulos [Wed, 6 May 2015 17:35:43 +0000 (17:35 +0000)]
Merge "Relax builtin precision tests, fix issue in div rounding" into mnc-dev
Mika Isojärvi [Wed, 6 May 2015 00:47:32 +0000 (00:47 +0000)]
Merge "Relax ordering requirements for non-conformant configs." into mnc-dev
Mika Isojärvi [Wed, 6 May 2015 00:24:38 +0000 (00:24 +0000)]
Merge "Remove uniform block tests using double underscore." into mnc-dev
Mika Isojärvi [Tue, 5 May 2015 22:55:33 +0000 (15:55 -0700)]
Relax ordering requirements for non-conformant configs.
Allow non-conformant EGLConfigs to appear in any order as there might be other
sorting rules for them.
Bug:
20831810
Change-Id: I0a83e9313cd86521b593396b380ee775188aba8a
Mika Isojärvi [Wed, 6 May 2015 00:21:30 +0000 (00:21 +0000)]
Merge "Allow BUFFER_TYPE_YUV as BUFFER_TYPE if extension is supported." into mnc-dev
Jarkko Pöyry [Wed, 6 May 2015 00:20:58 +0000 (00:20 +0000)]
Merge "Make empty declaration tests positive." into mnc-dev
Pyry Haulos [Tue, 5 May 2015 19:31:13 +0000 (12:31 -0700)]
Relax builtin precision tests, fix issue in div rounding
* sin(), cos() and derived: Use |x| * 2^-10 for mediump inputs outside
of range [-pi,pi].
* asin(), acos(), and atan(): Use 4096 ULP for highp (from OpenCL's
fast relaxed math).
* modf(): allow any value, including NaN, as fractional if Inf support
is not mandated for the precision (lowp and mediump).
* atan(y, x): allow any value if y or x is Inf and no Inf support is
mandated for the precision.
* div (and derived): allow rounding of -/+inf to -/+maxval when both
inputs are ordinary and denominator is not 0 (legal in RTZ mode).
Bug:
20453754
Bug:
18323265
Change-Id: I8e2fad8909e29993e961d66a175963071ea2e5a8
Mika Isojärvi [Tue, 5 May 2015 23:55:13 +0000 (23:55 +0000)]
Merge "Update EGL wrappers and utilities to latest spec." into mnc-dev
Mika Isojärvi [Tue, 5 May 2015 23:51:36 +0000 (16:51 -0700)]
Remove uniform block tests using double underscore.
Any double underscore sequence might be macro and macros using double
underscore trigger undefined behavior.
Bug:
20421327
Change-Id: I4c1ed5385c564cffc8ec0d115d271dc69d1d2916
Kalle Raita [Tue, 5 May 2015 23:28:18 +0000 (23:28 +0000)]
Merge "Check that HDR version of ASTC is present for non-2D texture targets." into mnc-dev
Mika Isojärvi [Tue, 5 May 2015 22:19:48 +0000 (15:19 -0700)]
Allow BUFFER_TYPE_YUV as BUFFER_TYPE if extension is supported.
If EGL_EXT_yuv_surface is supported allow EGLConfigs to return
EGL_BUFFER_TYPE_YUV_EXT as EGL_BUFFER_TYPE.
Bug:
20831810
Change-Id: I7881dffc417e0477834280b18c4f3a8bd44eb79b
Kalle Raita [Tue, 5 May 2015 22:18:33 +0000 (15:18 -0700)]
Check that HDR version of ASTC is present for non-2D texture targets.
Bug:
20763531
Change-Id: I45451e9aec4bd51370ce784a34e312d455bbf6a7
Jarkko Pöyry [Tue, 5 May 2015 22:45:53 +0000 (15:45 -0700)]
Make empty declaration tests positive.
Bug:
20699693
Change-Id: I5ea0a159755472a8c99c94ec086936d8d73db1f3
Jarkko Pöyry [Tue, 5 May 2015 21:17:34 +0000 (14:17 -0700)]
Fix negative block syntax tests expecting compile success.
Bug:
20852057
Change-Id: Ic92a6b1991a2580713c6f0d0e5c0ecd72bd59e14
Mika Isojärvi [Tue, 5 May 2015 20:11:59 +0000 (20:11 +0000)]
Merge "Add missing finish() calls to multithread and multi context tests." into mnc-dev
Mika Isojärvi [Tue, 5 May 2015 19:36:38 +0000 (19:36 +0000)]
Merge "Require conformant configs in EGL tests." into mnc-dev
Jarkko Pöyry [Tue, 5 May 2015 17:53:21 +0000 (10:53 -0700)]
Fix primitive bbox line verification regression.
Bug:
20852057
Bug:
20453464
Change-Id: Ie59636ad50cc26bd52d45554113e869dc2c6ade7
Jarkko Pöyry [Tue, 5 May 2015 01:48:45 +0000 (01:48 +0000)]
Merge "Check OES_texture_npot in ES2 texture completeness tests." into mnc-dev
Mika Isojärvi [Tue, 5 May 2015 01:03:44 +0000 (18:03 -0700)]
Update EGL wrappers and utilities to latest spec.
Change-Id: Ie8d9ed179cc291889202b321df67e5f83d29951d
Jarkko Pöyry [Mon, 4 May 2015 20:06:16 +0000 (13:06 -0700)]
Check OES_texture_npot in ES2 texture completeness tests.
- Check GL_OES_texture_npot extension in addition to NV extension.
- Remove unused cstdlib include.
Bug:
20808878
Change-Id: I9d6e586cbc0151a7b6900eb30d786c7035b75bd8
Mika Isojärvi [Tue, 5 May 2015 00:29:39 +0000 (17:29 -0700)]
Add missing finish() calls to multithread and multi context tests.
Bug:
20751454
Change-Id: Ic6de190c4784bee483ca2a0e74c5b4c0899f2886
Mika Isojärvi [Mon, 4 May 2015 23:41:57 +0000 (16:41 -0700)]
Require conformant configs in EGL tests.
Bug:
20825158
Change-Id: I8173ea1f2217f642041e66bfe7c509a1f2859e15
Pyry Haulos [Mon, 4 May 2015 22:02:54 +0000 (15:02 -0700)]
Remove problematic shaders.texture_functions tests from mustpass
Bug:
20699985
Bug:
20700212
Change-Id: I0806a4fcbd92a643f2b92a447f8d2a6d30898364
Pyry Haulos [Mon, 4 May 2015 19:56:16 +0000 (19:56 +0000)]
Merge "Remove mediump cos() tests from mustpass" into mnc-dev
Pyry Haulos [Mon, 4 May 2015 19:44:49 +0000 (12:44 -0700)]
Remove mediump cos() tests from mustpass
Bug:
20453754
Change-Id: I71e036cd249d8d835357bbae134ebc6b263c9962
Pyry Haulos [Mon, 4 May 2015 19:30:25 +0000 (12:30 -0700)]
Relax texture filtering precision requirements in ES2 tests
Bug:
20818451
Change-Id: Ia81d90020ad0403ce3a60ec7799a415f1d458cc6
Mika Isojärvi [Fri, 1 May 2015 23:07:06 +0000 (23:07 +0000)]
Merge "Fix memory leak in semaphore self tests." into mnc-dev
Jarkko Pöyry [Fri, 1 May 2015 22:30:09 +0000 (15:30 -0700)]
Fix unused variable warning in release builds.
Change-Id: I00c6ee09f2821a7713bbc2cb8b71b0e589163e97
Mika Isojärvi [Mon, 27 Apr 2015 23:26:41 +0000 (16:26 -0700)]
Fix memory leak in semaphore self tests.
Change-Id: I82a5c8af6f81692704bd7f6a6b1248685883d92a
Mika Isojärvi [Fri, 1 May 2015 20:46:41 +0000 (20:46 +0000)]
Merge "Move GLSL 3.00 ES repeated uniform blocks to invalid group." into mnc-dev
Mika Isojärvi [Fri, 1 May 2015 20:14:22 +0000 (13:14 -0700)]
Move GLSL 3.00 ES repeated uniform blocks to invalid group.
Bug:
20421050
Change-Id: I1587d17ddf7801f13da6d997c4917b0b254892db
Jarkko Pöyry [Fri, 1 May 2015 18:15:21 +0000 (11:15 -0700)]
Assume border color is always in linear space.
Bug:
20755158
Change-Id: I18e048e1537ef5b02020d139eb58a498ab917722
Jarkko Pöyry [Fri, 1 May 2015 00:40:50 +0000 (00:40 +0000)]
Merge "Add EXT_texture_border_clamp tests." into mnc-dev
Jarkko Pöyry [Fri, 10 Apr 2015 01:49:48 +0000 (18:49 -0700)]
Add EXT_texture_border_clamp tests.
Change-Id: I37b2d473e2b1ccdd40a55daa3e6c12e2a28a6e0d
Jarkko Pöyry [Thu, 30 Apr 2015 18:35:43 +0000 (18:35 +0000)]
Merge "Do not assume support for multisampled wide lines." into mnc-dev
Pyry Haulos [Thu, 30 Apr 2015 08:49:24 +0000 (08:49 +0000)]
Merge "Add bug numbers to ES3.1 HW issues list" into mnc-dev
Pyry Haulos [Thu, 30 Apr 2015 08:47:57 +0000 (08:47 +0000)]
Merge "Update GLES3 HW issues list" into mnc-dev
Jarkko Pöyry [Mon, 27 Apr 2015 23:20:50 +0000 (16:20 -0700)]
Do not assume support for multisampled wide lines.
- Allow rasterization, interpolation, and clipping multisampled wide
line cases to fail and report Compatibility Warning instad of
failure.
- Allow line width verification failures in primitive bounding box
tests (and generate compatibility warning).
- Not modiyfing helper_invocation cases since the test tolerate
uncertain line rendering widths.
Bug:
20453464
Change-Id: Ib1ef997c5476e04a02a103f0636201ed94c9354e
Pyry Haulos [Wed, 29 Apr 2015 15:03:56 +0000 (08:03 -0700)]
Add bug numbers to ES3.1 HW issues list
Change-Id: I04928235773f76b1828f2d1c062ac51400d0d7c8
Pyry Haulos [Wed, 29 Apr 2015 12:15:44 +0000 (05:15 -0700)]
Update GLES3 HW issues list
Change-Id: I0279a4b28fdd4511181797194a56f35fbda492e5
Jarkko Pöyry [Tue, 28 Apr 2015 21:03:29 +0000 (14:03 -0700)]
Fix unused variable warning in Release builds.
Change-Id: I7aabc6fdad54f22e072c716a7098678d845e98fe
Jarkko Pöyry [Mon, 27 Apr 2015 22:14:35 +0000 (15:14 -0700)]
Update default VAO attrib divisor tests.
- Expect vertexAttribDivisor on ES31 with default VAO to not generate
a error, i.e. expect vertexAttribDivisor in ES31 to be compatible with
ES30.
Bug:
20154392
Change-Id: I2c009518f5f0686b269f3d2a33ea8a19c3d02470
Jarkko Pöyry [Fri, 24 Apr 2015 23:12:49 +0000 (23:12 +0000)]
Merge "Improve texture border color handling."
Jarkko Pöyry [Fri, 24 Apr 2015 23:12:37 +0000 (23:12 +0000)]
Merge "Avoid handling combined depth-stencil textures as color data."
Jarkko Pöyry [Tue, 31 Mar 2015 03:28:07 +0000 (20:28 -0700)]
Improve texture border color handling.
- Apply border color only to active channels.
- Clamp border color to format range as specified in GL.
- Support int and uint border colors.
- Convert border color of sRGB formats to linear.
- Support border color in texture compare verifier.
Change-Id: Id191c605e61aa513a1aa65c3009dabda72c81163
Jarkko Pöyry [Thu, 23 Apr 2015 02:31:34 +0000 (19:31 -0700)]
Avoid handling combined depth-stencil textures as color data.
Change-Id: I151b443e25329b7903870a08a558f1a38e58abe7
Mika Isojärvi [Fri, 24 Apr 2015 22:58:22 +0000 (22:58 +0000)]
Merge "Use sched_getaffinity for both linux and android."
Jarkko Pöyry [Fri, 24 Apr 2015 22:47:47 +0000 (22:47 +0000)]
Merge "Move getEffectiveTextureView() to tcuTextureUtil."
Jarkko Pöyry [Fri, 24 Apr 2015 22:47:30 +0000 (22:47 +0000)]
Merge "Add support for depth-stencil-mode to Sampler."
Jarkko Pöyry [Fri, 24 Apr 2015 22:07:52 +0000 (22:07 +0000)]
Merge "Handle stencil textures as one-channel int textures."
Jarkko Pöyry [Fri, 24 Apr 2015 22:07:38 +0000 (22:07 +0000)]
Merge "Simplify sglr depth-stencil related code by using tcu and rr utilities."
Jarkko Pöyry [Fri, 24 Apr 2015 22:04:33 +0000 (22:04 +0000)]
Merge "Add getDefaultGatherOffsets() to texture utils."
Mika Isojärvi [Sat, 11 Apr 2015 01:14:14 +0000 (18:14 -0700)]
Use sched_getaffinity for both linux and android.
Use sched_getaffinity to get number of available cores.
Change-Id: I501c81a01a22a4ef3363370f40d35c3320164a0f
Jarkko Pöyry [Fri, 24 Apr 2015 21:46:27 +0000 (21:46 +0000)]
Merge "Update GLES3 HW issues list."
Pyry Haulos [Fri, 24 Apr 2015 17:58:49 +0000 (10:58 -0700)]
Update ES2 & EGL mustpass lists based on latest feedback
Change-Id: I7e0996bb3cbcf1c4f036219d5e346cc293959316
Jarkko Pöyry [Wed, 1 Apr 2015 19:30:42 +0000 (12:30 -0700)]
Handle stencil textures as one-channel int textures.
- Make sampling from stencil texture return stencil value in R channel.
This makes stencil textures behave as in GL.
- Fix tests assuming component w is always stencil.
Change-Id: Ibc12949435330e0ac52a469b2fe8f3eab57d9e67
Jarkko Pöyry [Fri, 24 Apr 2015 01:18:30 +0000 (18:18 -0700)]
Move getEffectiveTextureView() to tcuTextureUtil.
Change-Id: Ia3a1ff2da118c99b2c83d4ccf77eb325d03a85ca
Jarkko Pöyry [Thu, 23 Apr 2015 03:01:38 +0000 (20:01 -0700)]
Add support for depth-stencil-mode to Sampler.
- Add depth-stencil-texture-mode to sampler.
- Support depth-stencil mode in glsTextureTestUtil.
Change-Id: Iedf9db561fea595309638a491e0024f9ca7d51ab
Jarkko Pöyry [Thu, 23 Apr 2015 23:02:39 +0000 (16:02 -0700)]
Add getDefaultGatherOffsets() to texture utils.
Change-Id: Idffc3f4a6b03c227d16d28125a7c8551ad1ad335
Jarkko Pöyry [Tue, 21 Apr 2015 02:46:36 +0000 (19:46 -0700)]
Simplify sglr depth-stencil related code by using tcu and rr utilities.
Change-Id: Id1996c65e3f58729cf3aa54da8653e249baa704e
Jarkko Pöyry [Tue, 21 Apr 2015 03:48:15 +0000 (20:48 -0700)]
Add N-bit min/max/mask utilities to deInt32.h.
- Add internal tests.
- Enable int32, stl_util and command line self tests.
Change-Id: I8546c6fa8e629da7c0a068eeffc88614f7ad1b4e
Jarkko Pöyry [Thu, 23 Apr 2015 20:13:36 +0000 (20:13 +0000)]
Merge "Fix valgrind warnings."
Pyry Haulos [Thu, 23 Apr 2015 18:34:58 +0000 (11:34 -0700)]
Fix dethread build on OS X
On Darwin systems _SC_NPROCESSORS_CONF and _ONLN depend on
_DARWIN_C_FULL which is very cubersome to enable.
Change-Id: Ic78e861d9a46fd633e896461bf47901b7abf710f
Jarkko Pöyry [Thu, 23 Apr 2015 04:20:30 +0000 (21:20 -0700)]
Fix valgrind warnings.
Change-Id: I457ad875af65a62cd7d836de4b07b4f272982338
Jarkko Pöyry [Wed, 22 Apr 2015 02:01:30 +0000 (02:01 +0000)]
Merge "Implement tcu::clear{Depth|Stencil} using tcu::clear."
Jarkko Pöyry [Tue, 21 Apr 2015 21:08:09 +0000 (14:08 -0700)]
Update GLES3 HW issues list.
Bug:
20453463
Change-Id: Ifba442b32451e2bcc1c89a79e034325e8d3e7eb5
Jarkko Pöyry [Mon, 20 Apr 2015 20:35:51 +0000 (13:35 -0700)]
Add UNSIGNED_INT24 channel format.
- Add UINT24 format to tcuTexture.
- Use UINT24 format instead of a combined format in depth-stencil clear
tests.
Change-Id: Ib1ec54edd0c6ed114130fcfc63436298c4bb70c3
Jarkko Pöyry [Tue, 21 Apr 2015 20:50:15 +0000 (20:50 +0000)]
Merge "Remove getDataSize and setPixels from PixelBufferAccess."
Jarkko Pöyry [Tue, 21 Apr 2015 02:05:26 +0000 (19:05 -0700)]
Implement tcu::clear{Depth|Stencil} using tcu::clear.
- Remove duplicated code in clear*.
- Add fillRow() sanity checks.
Change-Id: I81dc8be98c38691ad95fc0cfc659d6a75a24fde8
Jarkko Pöyry [Mon, 20 Apr 2015 22:13:56 +0000 (15:13 -0700)]
Remove getDataSize and setPixels from PixelBufferAccess.
- Remove functions that were not safe to use with non-tightly packed
pixel buffer accesses.
Change-Id: I32b83b089da40ccd052f9d7250498a9c4aa4036f
Jarkko Pöyry [Tue, 21 Apr 2015 00:32:49 +0000 (17:32 -0700)]
Add utilities to split combined-depth-stencil accesses.
Change-Id: I2fed3761217fd55d0273e01a951867804a15a5b9
Jarkko Pöyry [Tue, 21 Apr 2015 19:54:15 +0000 (19:54 +0000)]
Merge "Avoid accessing border color directly in tcuTexture."
Jarkko Pöyry [Tue, 21 Apr 2015 01:50:49 +0000 (18:50 -0700)]
Avoid accessing pixel depth directly in tcuTexCompareVerifier.
- Avoid accessing depth directly to make structure idential to
tcuTexLookupVerifier and to make refactoring easier.
- Add sanity checks to isGatherOffsetsCompareResultValid().
Change-Id: I3afc3015edc775c1baf13eea94a781bc6f6e4829
Jarkko Pöyry [Tue, 21 Apr 2015 00:44:44 +0000 (00:44 +0000)]
Merge "Support not tightly packed pixel buffer accesses in tcuTextureUtil."
Jarkko Pöyry [Fri, 17 Apr 2015 22:21:36 +0000 (15:21 -0700)]
Avoid accessing border color directly in tcuTexture.
- Use lookupBorder to lookup border color.
- Fix assertion failure on 2d array texture gather with border
clamp wrap mode.
Change-Id: If28dee16b743154c7ee0794d45da9d12bccc4fd1
Jarkko Pöyry [Wed, 1 Apr 2015 22:42:35 +0000 (15:42 -0700)]
Support not tightly packed pixel buffer accesses in tcuTextureUtil.
- Fix assumptions that pixel size == pixel stride.
- Remove copyRawPixels. It was only useful for format reinterpreting
data copies but there was not code using it for that.
Change-Id: I2743c5f197d7cf2bc4ef76e3ebe8b9dd6577c28e
Mika Isojärvi [Mon, 20 Apr 2015 23:55:36 +0000 (23:55 +0000)]
Merge "Allow both errors in getFramebufferAttachmentParameter tests."
Jarkko Pöyry [Mon, 20 Apr 2015 23:55:30 +0000 (23:55 +0000)]
Merge "Add getTextureFormatChannelMask."
Jarkko Pöyry [Mon, 20 Apr 2015 23:55:28 +0000 (23:55 +0000)]
Merge "Skip complex compare verification if reference and result are identical."
Jarkko Pöyry [Mon, 20 Apr 2015 23:55:25 +0000 (23:55 +0000)]
Merge "Improve logging of texture border color."
Mika Isojärvi [Mon, 20 Apr 2015 21:09:54 +0000 (14:09 -0700)]
Allow both errors in getFramebufferAttachmentParameter tests.
Allow both GL_INVALID_ENUM and GL_INVALID_OPERATION in
getFramebufferAttachmentParameteriv negative tests.
Bug:
20340817
Change-Id: I8393d0d7af2e60b1666352da8f33504e21be677b
Mika Isojärvi [Mon, 20 Apr 2015 21:19:12 +0000 (14:19 -0700)]
Allow INVALID_OPERATION in glTexImage3D negative tests.
Allow both INVALID_OPERATION and INVALID_VALUE if internalformat is
not valid.
Bug:
20340818
Change-Id: Ie81f781f65d4d8d9996625d6824b0051a0a8a4b2