Merge "Fix color change verification in dithering tests" into nougat-cts-dev am: acf47d464f am: c2594c65ff
am: 1203cd8416

Change-Id: Idced4ef250b2fc485931b8d5358dd5ce6ee16e51

Merge "Fix color change verification in dithering tests" into nougat-cts-dev am: acf47d464f
am: c2594c65ff

Change-Id: Ifd798f6964576b23950beaedc843a4efce806968

Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev am: 9a83ec3f47 am: 90e6678bc9  -s ours
am: 18231b0d34  -s ours

Change-Id: I822a97a1a29f7dfd3525c9671b405fd0561d7834

Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am: eebcec1b52 am: 2585331908
am: 0543f8e619

Change-Id: I113f5eb8a7cdb975e9e9928a3cbdbf55637492ff

Merge "Fix color change verification in dithering tests" into nougat-cts-dev
am: acf47d464f

Change-Id: I82bfed0cc9cee128a8552b4e8cf3fb87ced37c9f

Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev am: 9a83ec3f47
am: 90e6678bc9  -s ours

Change-Id: I157b06b418801793909c853f0e3f51c574283d15

Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am: eebcec1b52
am: 2585331908

Change-Id: Ibc91272a8ad15f813f273cf05bb6b6f846ae600f

Merge "Fix color change verification in dithering tests" into nougat-cts-dev

Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev
am: 9a83ec3f47

Change-Id: I1dfb480ed3b5fb7f384a8fe9b0a852134fde1500

Try to determine renderable format in lifetime tests am: c0a5dc217f am: eba26e2387
am: d1aa6c62e3

Change-Id: I985925f6cc047cc2ba44e7d33a435809ea8a3681

Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev
am: eebcec1b52

Change-Id: Ib4d673157f82d00d0d27ab3496ac8a1dc6634fe1

Try to determine renderable format in lifetime tests am: c0a5dc217f
am: eba26e2387

Change-Id: I374e4e781d4b3d89c9e6a9e97deffe466298ddea

Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev

Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev

Try to determine renderable format in lifetime tests
am: c0a5dc217f

Change-Id: I99514ee1a3ccb9a0aa397f0a8e9e7d45b47ec9ba

Merge commit '9bd0272d004aabece70774113d1ff6d9dbf1301c' into HEAD

Test: check_build_sanity.py
Change-Id: I83a7e6b3626bcf5a51af5a4bfe49f727bd2c4da1

Merge "Log which watchdog timer was exceeded"

Log which watchdog timer was exceeded

Test: Timeout failure for max_concurrent.framebuffer on Marlin
Change-Id: Ie8396c6506e09bbe94c6d5dc6c29fd6e20c7f436

Update Android CTS Vulkan waivers list to match Khronos CTS
am: 96cb702688

Change-Id: I1fec35b071d94ca81a3dcaa96cb111fa3f7101bc

Update Android CTS Vulkan waivers list to match Khronos CTS

Bug: 36817508
Change-Id: Ib394652ca3229a06704a83bea53806a3397c7ec3

Remove printfs from qpTestLog

These clutter up the standard output with shader compile times.
Also remove qpTestLog_writeMessage since it didn't seem to be used.

Change-Id: I218651f37ff6c9f40f6e81115f7fc64adb8d8500

Merge vk-gl-cts/master into aosp/deqp-dev

Add tests for storage buffer unsized array length

Verifies that the length observed in the shader is correct, when binding
a portion of a buffer. Covers both the case where an explicit length of
the binding is given, and when VK_WHOLE_SIZE is used.

VK-GL-CTS issue: 449
Components: Vulkan

Change-Id: I9e30b2b56e4de888bb02fef3de1370fcd106c845

Add render pass multisample resolve tests

- Check that attachment components are resolved consistently
- Check that attachments are resolved consistently
- Check that integer formats always resolve to one of the samples
- Check that empty sample mask doesn't change values
- Check that all possible sample combinations of 1.0 and 0.0 values
  resolve to 0.5 on average.

VK-GL-CTS issues: 96
Components: Vulkan

Change-Id: I18b92ed713175cd935651575f4e48d9fd207ef00

Add multisample renderpass input attachment tests

VK-GL-CTS issues: 96
Components: Vulkan

Change-Id: I9ea87736c82148515da3c2d95301e6302be4257d

Merge aosp/deqp-dev into vk-gl-cts/master

Change-Id: Ib50d43dd6d3ba38a146e5266f1036fd27beb279b
Components: AOSP

Fix GCC 6.3 warnings in SRGB write control tests

Change-Id: I6f0f2054a50288a1c65bbd9693e9382d8f69bbcd

Fix error mask generation in checkLineContinuity

Even if some pixels are missing the function could return
all-zero errorMask if the messageLimitcounter was exhausted.

Components: AOSP
Affects: dEQP-GLES31.functional.primitive_bounding_box.lines.*

Google bug: 35987764

Ensure expected error in copytexsubimage2d_incomplete_framebuffer
am: 89bb39d249

Change-Id: I43f1e866fb5b932720623e55b1ee2aa2f14bb1d2

Update KC CTS reference

Affects:
GTF-GLES2.gtf.GL2ExtensionTests.egl_create_context.egl_create_context

Components: OpenGL

VK-GL-CTS issue: 353

Change-Id: I95dd480216a685e79c5dc936f1ee59c4eda714aa

Ensure expected error in copytexsubimage2d_incomplete_framebuffer

The GLES2 version of the copytexsubimage2d_incomplete_framebuffer test could
potentially throw INVALID_OPERATION instead of expected INVALID_FRAMEBUFFER_OPERATION
due to the cubemap texture not being defined by a previous TexImage2D.
This change re-uses the GLES3 version of the same test and ensures that
INVALID_FRAMEBUFFER_OPERATION is thrown.

Affects:
dEQP-GLES2.functional.negative_api.texture.copytexsubimage2d_incomplete_framebuffer

Change-Id: I7b3f770ff31c73d770a53f6b6bdae3ea4a37b63a
Components: AOSP
Google bug: 37497541

Exclude dEQP-GLES2.functional.negative_api.texture.copytexsubimage2d_incomplete_framebuffer

Affects:
dEQP-GLES2.functional.negative_api.texture.copytexsubimage2d_incomplete_framebuffer

Components: OpenGL

VK-GL-CTS issue: 380

Change-Id: Ie30686686d9c2829e23f86b3ff1292ddcb2614fe

Add negative tests for implicit conversions

Implicit conversion are forbidden in GLES
unless GL_EXT_shader_implicit_conversions is supported.
This change adds negative tests for implicit conversions.

GL_EXT_shader_implicit_conversions is specified against
ESSL 3.10, therefore it should be fine to add the negative
tests to dEQP-GLES2/dEQP-GLES3

Components: AOSP

Affects:
dEQP-GLES2.functional.shaders.invalid_implicit_conversions.*
dEQP-GLES3.functional.shaders.invalid_implicit_conversions.*

VK-GL-CTS issue: 142

Change-Id: I3afb0a5f2074868f882644ad830e4159747e4b14

Fix color change verification in dithering tests

Tests were supposed to allow color change once per row/column depending
on gradient direction but instead allowed color change in constant
direction only once over whole image.

Affects:

dEQP-GLES2.functional.dither.disabled.gradient_*
dEQP-GLES3.functional.dither.disabled.gradient_*

Bug: 37477346
Change-Id: I37ef06b4ff527f8c316eae56c8a99c88cdaaf4b4

Exclude dEQP-GLES2.functional.flush_finish.flush

Affects:
dEQP-GLES2.functional.flush_finish.flush

Components: OpenGL

VK-GL-CTS issue: 375

Change-Id: I1751a07886650114734ed656c30f754cb470b1c1

Exclude dEQP-GLES2.functional.polygon_offset.*render_with_units

Affects:

dEQP-GLES2.functional.polygon_offset.default_render_with_units
dEQP-GLES2.functional.polygon_offset.fixed16_render_with_units

Components: OpenGL

VK-GL-CTS issue: 374

Change-Id: I51b635df479215e5a5886e0a2ff23ec8363b1acf

Exclude few dEQP-GLES2.functional.*.nested_structs_arrays tests

Affects:

dEQP-GLES2.functional.uniform_api.info_query.nested_structs_arrays.mat4_mat2_vertex
dEQP-GLES2.functional.uniform_api.info_query.nested_structs_arrays.mat4_mat2_both
dEQP-GLES2.functional.uniform_api.value.initial.get_uniform.nested_structs_arrays.mat4_mat2_vertex
dEQP-GLES2.functional.uniform_api.value.initial.get_uniform.nested_structs_arrays.mat4_mat2_both
dEQP-GLES2.functional.uniform_api.value.initial.render.nested_structs_arrays.mat4_mat2_vertex
dEQP-GLES2.functional.uniform_api.value.initial.render.nested_structs_arrays.mat4_mat2_both
dEQP-GLES2.functional.uniform_api.value.assigned.by_pointer.get_uniform.nested_structs_arrays.mat4_mat2_vertex
dEQP-GLES2.functional.uniform_api.value.assigned.by_pointer.get_uniform.nested_structs_arrays.mat4_mat2_both
dEQP-GLES2.functional.uniform_api.value.assigned.by_pointer.render.nested_structs_arrays.mat4_mat2_vertex
dEQP-GLES2.functional.uniform_api.value.assigned.by_pointer.render.nested_structs_arrays.mat4_mat2_both

Components: OpenGL

VK-GL-CTS issue: 373

Change-Id: I343b177810bc37d6199c0135a591e2148f687ebd

Exclude dEQP-GLES2.functional.attribute_location.bind_aliasing.max_cond*

Affects:

dEQP-GLES2.functional.attribute_location.bind_aliasing.max_cond_float
dEQP-GLES2.functional.attribute_location.bind_aliasing.max_cond_vec2
dEQP-GLES2.functional.attribute_location.bind_aliasing.max_cond_vec3
dEQP-GLES2.functional.attribute_location.bind_aliasing.max_cond_vec4
dEQP-GLES2.functional.attribute_location.bind_aliasing.max_cond_mat2
dEQP-GLES2.functional.attribute_location.bind_aliasing.max_cond_mat3
dEQP-GLES2.functional.attribute_location.bind_aliasing.max_cond_mat4

Components: OpenGL

VK-GL-CTS issue: 372

Change-Id: I74de43935fc3ead5008ce5f31439716f5600ef35

Try to determine renderable format in lifetime tests

Affects:

dEQP-GLES2.functional.lifetime.attach.deleted_input.renderbuffer_framebuffer
dEQP-GLES2.functional.lifetime.attach.deleted_input.texture_framebuffer
dEQP-GLES2.functional.lifetime.attach.deleted_output.renderbuffer_framebuffer
dEQP-GLES2.functional.lifetime.attach.deleted_output.texture_framebuffer

Bug: 36724173

Change-Id: I46196317c144f294adce65ff4690571d28e1caf3

DEPTH_STENCIL_OES as tex format requires OES_depth_texture
am: 8290443470

Change-Id: I84e9f7f9e732a2b5c728dd2cd35a68198d091fad

DEPTH_STENCIL_OES as tex format requires OES_depth_texture

Affects:

dEQP-GLES2.functional.fbo.completeness.*
dEQP-GLES3.functional.fbo.completeness.*

Bug: 36727598
Merged-In: Ic79408c21b80ea458baecf79c042e2694e72e0b2
Change-Id: Ib302b21b2b28d4f13aa6df8bdcac878f22ae51be

DEPTH_STENCIL_OES as tex format requires OES_depth_texture

Affects:

dEQP-GLES2.functional.fbo.completeness.*
dEQP-GLES3.functional.fbo.completeness.*

Bug: 36727598
Change-Id: Ic79408c21b80ea458baecf79c042e2694e72e0b2

eglGetFrameTimestamps: Use reserved enum values.
am: 84574b5c7b

Change-Id: I00ff6beadd8056729afb3f607efb4786b4287fbb

eglGetFrameTimestamps: Allow optional present support.
am: afb7428641

Change-Id: Ie0bdecf04dca30dfe9aa6e3e600c81317df15b7d

eglGetFrameTimestamps: pending vs. invalid timestamps.
am: b4e217e4a1

Change-Id: Ie88254e6829e2f5526240ad05a7d6b3e4010b3c8

eglGetFrameTimestamps: Use reserved enum values.

Test: --deqp-case=dEQP-EGL*get_frame_timestamps*

eglGetFrameTimestamps: Allow optional present support.

Test: --deqp-case=dEQP-EGL*get_frame_timestamps*

Change-Id: I5cfb334966f7f2794fe0043e1809de324a6e3d0e

eglGetFrameTimestamps: pending vs. invalid timestamps.

Test: --deqp-case=dEQP-EGL*get_frame_timestamps*

Change-Id: I27718995c82748b55bc53e4d78a7f572e16a45ab

Exclude dEQP-GLES2.functional.fragment_ops.depth_stencil.stencil_ops.*

Affects: dEQP-GLES2.functional.fragment_ops.depth_stencil.stencil_ops.*

Components: OpenGL

VK-GL-CTS issue: 370

Change-Id: Ifc25a189fa4ebf6cd36d0f07ec0af1c6f329b24a

Merge vk-gl-cts/vulkan-cts-1.0.2 into vk-gl-cts/master

Change-Id: I396972ad31a87e7e88b69c05595393af3f990540

Merge vk-gl-cts/vulkan-cts-1.0.1 into vk-gl-cts/vulkan-cts-1.0.2

Merge vk-gl-cts/vulkan-cts-1.0.0 into vk-gl-cts/vulkan-cts-1.0.1

Change-Id: Iff109ea0dba048599d3deb4d8f42a7cac8b62283

Fix typo in dE-IT.build_info.de_endianness_consistent name

Components: AOSP

Change-Id: Ie2cb1335834c010251021bac6b3882a37ede3f75

Merge "Try harder to defeat GLSL compiler dead-code optimizations" into nougat-cts-dev am: aeef6dd8f5 am: a4ddab16dd
am: 8ca5b73a02

Change-Id: I278dbd93f410e6880a0a9d5b10d0c1268fa43f26

Merge "Try harder to defeat GLSL compiler dead-code optimizations" into nougat-cts-dev am: aeef6dd8f5
am: a4ddab16dd

Change-Id: I18fe6a8ba3ba328513afdf1f5e5d32db6de32373

Merge "Try harder to defeat GLSL compiler dead-code optimizations" into nougat-cts-dev
am: aeef6dd8f5

Change-Id: I8300511b30c7bd03885a6cb019970852f7e72693

Merge "Try harder to defeat GLSL compiler dead-code optimizations" into nougat-cts-dev

Try harder to defeat GLSL compiler dead-code optimizations

A number of CTS tests generate shaders like like:

    #version 310 es

    buffer TargetInterface
    {
            highp float target;
    };

    highp vec4 readInputs()
    {
            highp vec4 retValue = vec4(0.0);
            retValue += vec4(float(target));
            return retValue;
    }

    void writeOutputs(in highp vec4 dummyValue)
    {
            target = float(dummyValue.y);
    }

    void main()
    {
            writeOutputs(readInputs());
    }

After various common optimizations this becomes:

    buffer TargetInterface
    {
            highp float target;
    };

    void main()
    {
            target = target;
    }

In the absence of memoryBarrier() or qualifiers on the buffer, there is
no guarantee about the order of writes to the buffer.  Since this write
is not guaranteed to be visible either on the GPU or the CPU, we
eliminate it.  Since there is no access to target in the shader, we
report GL_REFERENCED_BY_FRAGMENT_SHADER = GL_FALSE.  The tests expect
GL_TRUE.

The vectored versions of this test swizzle the value read from the
buffer before writing it back.  These writes are not eliminated.

Adding a uniform instead of a literal constant also prevents the reads
and writes of the SSBO from being eliminated.

v2: Ignore the uniform named "zero" in
ResourceListTestCase::verifyResourceList.  The alternative was to add
zero to the resource list, but that required making small changes
(mostly removing const) from over a dozen places in the code.  This
slightly hacky, but localized, change seemed better.

v3: Various coding standards fixes suggested by Alexander Galazin and
Pyry.  Add getDummyZeroUniformName to query name of the zero uniform and
a lot more documentation.  Both suggested by Pyry.

The following tests are affected:

- dEQP-GLES31.functional.program_interface_query.buffer_variable.random.6
- dEQP-GLES31.functional.program_interface_query.buffer_variable.referenced_by.compute.unnamed_block.float
- dEQP-GLES31.functional.program_interface_query.buffer_variable.referenced_by.separable_fragment.unnamed_block.float
- dEQP-GLES31.functional.program_interface_query.buffer_variable.referenced_by.vertex_fragment_only_fragment.unnamed_block.float
- dEQP-GLES31.functional.program_interface_query.buffer_variable.referenced_by.vertex_fragment.unnamed_block.float
- dEQP-GLES31.functional.program_interface_query.buffer_variable.referenced_by.vertex_geo_fragment_only_fragment.unnamed_block.float
- dEQP-GLES31.functional.program_interface_query.buffer_variable.referenced_by.vertex_geo_fragment.unnamed_block.float
- dEQP-GLES31.functional.program_interface_query.buffer_variable.referenced_by.vertex_tess_fragment_only_fragment.unnamed_block.float
- dEQP-GLES31.functional.program_interface_query.buffer_variable.referenced_by.vertex_tess_fragment.unnamed_block.float
- dEQP-GLES31.functional.program_interface_query.buffer_variable.referenced_by.vertex_tess_geo_fragment_only_fragment.unnamed_block.float
- dEQP-GLES31.functional.program_interface_query.buffer_variable.referenced_by.vertex_tess_geo_fragment.unnamed_block.float

Change-Id: I867ad32476269ac1272c09672be0a6d6fe37e31e
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Bugzilla: https://cvs.khronos.org/bugzilla/show_bug.cgi?id=16114
Google bug: 37228062

Merge "Allow robustness tests on GLES 3.0"
am: ab3013ef10

Change-Id: If45ff3202fd0a0683567d879d188cae2833ceece

Merge "Allow robustness tests on GLES 3.0"

Allow robustness tests on GLES 3.0

Allow selected robustness tests run on GLES 3.0 instead of always
requiring 3.1.

Affects: dEQP-EGL.functional.robustness.*
Bug: 36428911
Test: dEQP-EGL.functional.robustness.* on Pixel XL

Change-Id: I78f543dcd667b5121f61150b082fd4a4a9c14b23

Add CTS_ARB_indirect_parameters specification proposal

This is CTS_ARB_indirect_parameters specification proposal.

components: OpenGL

VK-GL-CTS issue: 194

Change-Id: I3c59cedfe75f4c757bae3fbfb2a6b3759f5903a9

Add CTS_ARB_indirect_parameters implementation

This is CTS_ARB_indirect_parameters tests implementation

Affects:

GL45-CTS.indirect_parameters_tests.*

Components: OpenGL, Framework

VK-GL-CTS issue: 194

Change-Id: Ibddff6daf485a9d673cf1b09554c01b8b83958e1

copy_image test: do not require compressed formats on CM_ARRAY

Spec:
"An INVALID_OPERATION error is generated by TexImage3D if internalformat
is one of the EAC, ETC2, or RGTC compressed formats and either border is non-zero,
or target is not TEXTURE_2D_ARRAY."

Affects:
GL44-CTS.copy_image.incompatible_formats_compression

Components: OpenGL

VK-GL-CTS issue: 352

Change-Id: I77cbc09c2383d7d055776e1665f25b8c6051ee7d

Redeclare built-in variables in separable shaders

Change adds redeclaration of the built-in gl_perVertex struct
before using any of its member variables. Per spec, it is
necessary to do so for separable shaders.

Affects:

KHR-GL45.shader_image_size.* (46 tests)

Component: OpenGL

VK-GL-CTS issue: 343

Change-Id: I53372e9d98ee96201ab7f760e7ed16d78832f283

Allow PROVOKING_VERTEX for LAYER_PROVOKING_VERTEX

OpenGL differs from ES in that it allows GL_PROVOKING_VERTEX as a valid
response to a query about GL_LAYER_PROVOKING_VERTEX. In this case, the
test needs to then retrieve and use the value of GL_PROVOKING_VERTEX.

Affects:

KHR-GLES31.core.geometry_shader.layered_rendering.layered_rendering
KHR-GLES32.core.geometry_shader.layered_rendering.layered_rendering
KHR-GL44.geometry_shader.layered_rendering.layered_rendering
KHR-GL45.geometry_shader.layered_rendering.layered_rendering

(without the mustpass list patch applied, KHR-GLxx.* are GLxx-CTS.*)

Components: OpenGL
VK-GL-CTS issue: 341

Change-Id: I3fbd87f1ec47ee08f6584c4be27b41e80bc4e750

Set nearest filtering in GL CopyImage tests.

glCopyImageSubData requires textures to be mipmap complete.  These
tests create integer textures, but left the default min filter of
GL_NEAREST_MIPMAP_LINEAR or GL_LINEAR (for rectangle textures) in
place.  The completeness rules say that integer textures cannot be
mipmap complete with linear filtering.

Affects:
- GL45-CTS.copy_image.smoke_test
- GL45-CTS.copy_image.incompatible_formats
- GL45-CTS.copy_image.incompatible_formats_compression

Components: OpenGL
Khronos bugzilla: 16224
VK-GL-CTS issue: 330

Change-Id: I9554402ce348eb7dda63bf01b0548f68374d334a

Enable rasterizer discard for fma_precision tests

The gpu_shader5.fma_precision_* tests do not write to gl_Position in the
vertex shader as the only useful output from the tests is from transform
feedback. This leaves the gl_Position value undefined, causing
inconsistent results in our regression tests. Other similar tests (e.g.
fma_accuracy) do enable rasterizer discard.

Affects:

KHR-GLES31.core.gpu_shader5.fma_precision_float
KHR-GLES31.core.gpu_shader5.fma_precision_vec2
KHR-GLES31.core.gpu_shader5.fma_precision_vec3
KHR-GLES31.core.gpu_shader5.fma_precision_vec4
KHR-GLES32.core.gpu_shader5.fma_precision_float
KHR-GLES32.core.gpu_shader5.fma_precision_vec2
KHR-GLES32.core.gpu_shader5.fma_precision_vec3
KHR-GLES32.core.gpu_shader5.fma_precision_vec4
KHR-GLESEXT.gpu_shader5.fma_precision_float
KHR-GLESEXT.gpu_shader5.fma_precision_vec2
KHR-GLESEXT.gpu_shader5.fma_precision_vec3
KHR-GLESEXT.gpu_shader5.fma_precision_vec4

Components: OpenGL

VK-GL-CTS issue: 324

Change-Id: I955cf1bd7a31c1e67ecb613ecd0cedb58c8befe2

Fix unaligned XFB stores in GL44-CTS.gpu_shader_fp64.built_in_functions test

This change aligns all values in result buffer passed through transform
feedback to component size. This is done by aligning each variable in
result, so as per-vertex stride.

Spec:
"The results of appending a
    varying variable to a transform feedback buffer are undefined if any
    component of that variable would be written at an offset not aligned to
    the size of the component."

Components: OpenGL
VK-GL-CTS issue: 263

Affects test:
GL44-CTS.gpu_shader_fp64.built_in_functions

Change-Id: I74a02b161c06d8fb2d755d0fcf6211677a003e17

DirectStateAccessTexturesTests: fixes for textures_storage_errors

This commit fixes two situations while testing
TextureStorage2DMultisample and TextureStorage3DMultisample:

1. While testing a wrong target, the test was expecting
   INVALID_ENUM. But, from OpenGL 4.5 spec, section 8.19
   Immutable-Format Texture Images:

   "An INVALID_ENUM error is generated by TexStorage2DMultisample if
    target is not TEXTURE_2D_MULTISAMPLE or
    PROXY_TEXTURE_2D_MULTISAMPLE.

    An INVALID_OPERATION error is generated by
    TextureStorage2DMultisample if the effective target is not
    TEXTURE_2D_MULTISAMPLE."

2. While testing samples > MAX_SAMPLES, the test was expecting
   INVALID_VALUE. But from OpenGL 4.5 spec, section 8.19
   Immutable-Format Texture:

   "Calling TexStorage2DMultisample is equivalent to calling
    TexImage2DMultisample with the equivalently named parameters set
    to the same values, except that the resulting texture has
    immutable format."

    so going back to OpenGL 4.5 spec, section 8.8 Multisample
    Textures:

   "An INVALID_OPERATION error is generated if samples is greater than
    the maximum number of samples supported for this target and
    internalformat.  The maximum number of samples supported can be
    determined by calling GetInternalformativ with a pname of SAMPLES
    (see section 22.3)."

Affects:
GL45-CTS.direct_state_access.textures_storage_errors

Components: OpenGL

VK-GL-CTS issue: 183

Change-Id: I7484afba1bbadb1ab6ad8fc1a9e4a455ec2f84f5

Update GLES mustpass after AOSP merge

Components: OpenGL

Change-Id: Ie89739862c0d5bf7995f341cb626b1a5ddfb2d5b

Merge vulkan-cts-1.0.2 into aosp/master
am: 55da06144c

Change-Id: I6f5bb189fa1db31bc18acc50340113dd359da968

Merge vk-gl-cts/master into aosp/deqp-dev

Merge "x11_egl: search for glesv1_cm, toggle DEQP_SUPPORT_GLES1 on if found"
am: 89c3844ccb

Change-Id: I173509e62c9d905f6dcf4b5163c98d2ba82e7473

Merge vulkan-cts-1.0.2 into aosp/master

Contains following fixes that have been made after vulkan-cts-1.0.2.2:

 * Fix - uniform buffer incorrectly dereferenced
 * Use vkGetInstanceProcAddr(NULL) to load platform funcs
 * Imgtec Waiver for texture_gather*cube*depth32f*
 * Add VK_KHR_incremental_present to the list of allowed device
extensions
 * Use -std=c++03 with GCC and clang
 * Fix GCC 6.3 warnings in vulkan-cts-1.0.2
 * Improve check_build_sanity.py
 * Relax image verification in anisotropic filtering tests
 * Respect maxColorAttachments in image tests
 * Fix SPIR-V generation in dEQP-VK.spirv_assembly
 * Fix - depth/stencil images mandatory only for VK_IMAGE_TYPE_2D
 * Add missing barrier in ssbo layout tests

This merge doesn't match any Vulkan CTS release tag.

Bug: 36899783
Bug: 36817508
Change-Id: I5dff02835e5296e1c25ba67675c06e2261e5c476

Merge "x11_egl: search for glesv1_cm, toggle DEQP_SUPPORT_GLES1 on if found"

Merge vk-gl-cts/vulkan-cts-1.0.2 into vk-gl-cts/master

Change-Id: I17256fdcfe30d879548307bf5feb61a3ecd4ff39

Merge vk-gl-cts/vulkan-cts-1.0.1 into vk-gl-cts/vulkan-cts-1.0.2

Change-Id: Iaedfbb3579c55d33ebfc415197a67b8145725f4f

Fix - uniform buffer incorrectly dereferenced

Uniform buffer is incorrectly dereferenced in
ssbo layout tests.

Affected tests: dEQP-VK.ssbo.layout.*

Change-Id: I5831ad75f558f8992bed6bdc48b1833d2ee13d26

Use vkGetInstanceProcAddr(NULL) to load platform funcs

Vulkan specification says that only vkGetInstanceProcAddr() has to be
loaded using platform-specific means. Other 'platform'-class functions,
listed below, can be loaded using vkGetInstanceProcAddr(NULL, pName).

Following functions are loaded with vkGetInstanceProcAddr():
 * vkEnumerateInstanceExtensionProperties
 * vkEnumerateInstanceLayerProperties
 * vkCreateInstance

Change-Id: Iab0657bf93d3a36e4f4dda4a1f1550024db0890e

Do not re-init GL functions after context reset
am: 72c880b4c9

Change-Id: Ibe9564fccb61261dffba6f5fdefcccad755b31ba

Do not re-init GL functions after context reset

SharedContextResetCase was calling initGLFunctions() using a context
belonging to a share group where context reset has occurred.
initGLFunctions() calls glGetError() internally and at that point it
would return GL_CONTEXT_LOST.

Affects:

dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.shared_context_status.vertex
dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.shared_context_status.fragment
dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.shared_context_status.vertex_and_fragment
dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.shared_context_status.compute

Bug: 37077017
Change-Id: I27ae0951565760dee0bcc5040bb02a45c8f568f3

Merge vk-gl-cts/vulkan-cts-1.0.2 into vk-gl-cts/master

Change-Id: I8acaa616704915c8cb487ff9be2445b6b9ba26be

Merge vk-gl-cts/vulkan-cts-1.0.1 into vk-gl-cts/vulkan-cts-1.0.2

Change-Id: I2614d3a7ce451d47418e7c850a7c2c372f2189a9

Imgtec Waiver for texture_gather*cube*depth32f*

Some versions of Imagination Technologies G6200, G6230, G6400, and
G6430 Rogue Series 6 GPU's are unable to correctly filter CEM corners
with F32 textures, this includes the ability to gather texels for texel
gather instructions.

This CL excludes the affected tests from mustpass.

Affects:

All dEQP-VK.glsl.texture_gather.basic.cube.depth32f* tests except:

dEQP-VK.glsl.texture_gather.basic.cube.depth32f.no_corners*

Components: Vulkan

VK-GL-CTS issue: 336

Change-Id: I4e20d887ad2901f78a7af326035d7a2a9ae5e76a

Exclude tests that require non-default context

Components: OpenGL

Affects:
KHR-GLES32.context_flags.*
KHR-GLES32.robust.*

VK-GL-CTS issue: 354

Change-Id: I3103afa5d8a284919b5edb9e5fa2113e0236be86

Fix shader bugs in OOB tests
am: cf65c56fb4

Change-Id: I317e6a3e2db1bf7b4dcfd19f5664ce1046237350

Avoid resource errors on Android

- Specify offscreen surface for debug tests
- avoid creating additional contexts for fbo configs

Some platforms cannot create more than one native window,
so specify an offscreen surface for windowed mode tests
and make the tests unsupported in fbo-based runs
(which don't respect the surface type requests).

These all work now with the window config pass, and return
NOT_SUPPORTED on the fbo passes. Ideally we'd have a new
test run for this type of test that doesn't create it's own
context in the first place, but that is more involved than
we want to handle currently.

VK-GL-CTS Issue: 328, 333
Component: OpenGL
Affects:
KHR-GL45.khr_debug.* (or GL45-CTS.khr_debug.* if not using new mustpass)
KHR-GL45.robustness.* (or GL45-CTS.robustness.* if not using new mustpass)
KHR-GLES32.robust.robustness.*
KHR-GLES32.context_flags.*

Change-Id: I76b89e9b025a26314004093a1781ba4e887604be

x11_egl: search for glesv1_cm, toggle DEQP_SUPPORT_GLES1 on if found

Some tests require GLES1 support and report test failure if support
has not been built. Patch changes build time configure to check GLES1
via pkg-config. If it is found, we turn on GLES1 support so that tests
will run and pass.

Change-Id: I586464c5fb7bffc40355caf57b30438f37ce1f6c
Signed-off-by: Tapani Pälli <tapani.palli@intel.com>

Fix shader bugs in OOB tests

1. Check that the required number of vertex shader storage blocks is supported,
   throw NotSupported otherwise.
2. Use an array instead of a vector in local_array tests.
3. Try harder to defeat compiler optimizations on arrays, i.e. initialize it
   with different values.

Components: AOSP

Affects:
dEQP-EGL.functional.robustness.reset_context.shaders.out_of_bounds_non_robust.*.shader_storage_block.vertex*
dEQP-EGL.functional.robustness.reset_context.shaders.out_of_bounds_non_robust.*.local_array.*

Google bug: 36891454

Change-Id: I2aeb2d454295993126d4048759e5981421d5c0db

Add VK_KHR_incremental_present to the list of allowed device extensions

Otherwise dEQP-VK.api.info.device.extensions will fail
for drivers that expose the extension.

Components: Vulkan
VK-GL-CTS issue: 346

Affects:
dEQP-VK.api.info.device.extensions

Change-Id: If1a5d971226adca2bfd1586cb1f568e2ca244b6d

Merge aosp/master into aosp/deqp-dev

Fix warnings reported by VS2013

Change-Id: Ic8af18719b586d974917258d7cd51dd4b6305eb6
Components: Vulkan

Merge "merge in nyc-mr1-release history after reset to nyc-mr1-dev am: 868a8938ca am: aea1bbfaa2 am: 5c1cc6ba46 am: f7c84f0b66" into nyc-mr2-dev-plus-aosp
am: dbffc02c54

Change-Id: Id237c5b8b3ee060a4b588449786699dec7b60e39

merge in nyc-mr1-release history after reset to nyc-mr1-dev am: 868a8938ca am: aea1bbfaa2 am: 5c1cc6ba46 am: faa38a20ac
am: 5d20376574

Change-Id: I0b53d03d09f02c14fc8c6a305b202d93d89e7e22

Merge "Non-compressed copy image target size (64,64,8)" am: beba5d481a am: 9bbc395b49 am: c842de9d14
am: 392263d752

Change-Id: I0007ed9a7a65cd3e7f553989241a379e4fd20401

Merge "Allow ANGLE_depth_texture for FBO completeness." am: a8249e3a00 am: 8542846868 am: c7265ec450
am: 41bf5eddb0

Change-Id: I3875c23842f3236babbabebd2554060fb031ead6

Merge "Extend primitive_bounding_box negative tests" am: 1975e3bd28 am: 4983f5a49f am: a4941127f1
am: a4ffba40b9

Change-Id: I8ad270531112937e443e0b924278563191c639e4

Add shader storage negative coverage tests am: 51e20f1e25 am: 299bbc9a59 am: c960c8b34e
am: d9e474e1dc

Change-Id: I8a72c871885eea9849d376809a2af400e118747f

Encode es3pBufferDataUploadTests.cpp as utf-8 am: 455d82c60b am: ee11c5503a am: 48a17ce6e5
am: d026022f0b

Change-Id: Ia733f8ffa3c7eb36feee62ebf3e5ae5c9604f822