openharmony/third_party_vulkan-loader
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_vulkan-loader synced 2024-12-20 05:48:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

compiler_render_tests: Add anonymous block test

Browse Source 
Also sprinkle in some sparse bindings, although not used in test
by default.
This commit is contained in:
Cody Northrop 2014-11-05 17:08:33 -07:00
parent 3ef2fd9812
commit a1eee60f67
1 changed files with 50 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
tests/compiler_render_tests.cpp
View File

@ -1059,12 +1059,15 @@ void XglRenderTest::CreatePipelineFSUniformBlockBinding(XGL_PIPELINE* pipeline,
// assert (slots == bufferCount); // update as needed // assert (slots == bufferCount); // update as needed
XGL_DESCRIPTOR_SLOT_INFO *slotInfo = (XGL_DESCRIPTOR_SLOT_INFO*) malloc( bufferCount * sizeof(XGL_DESCRIPTOR_SLOT_INFO) ); XGL_DESCRIPTOR_SLOT_INFO *slotInfo = (XGL_DESCRIPTOR_SLOT_INFO*) malloc( bufferCount * sizeof(XGL_DESCRIPTOR_SLOT_INFO) );
for (int i = 0; i < bufferCount; ++i) { for (int i = 0; i < bufferCount - 1; ++i) {
// Note: These are all constant buffers // Note: These are all constant buffers
slotInfo[i].shaderEntityIndex = i; slotInfo[i].shaderEntityIndex = i;
slotInfo[i].slotObjectType = XGL_SLOT_SHADER_RESOURCE; slotInfo[i].slotObjectType = XGL_SLOT_SHADER_RESOURCE;
} }
slotInfo[bufferCount - 1].shaderEntityIndex = 18;
slotInfo[bufferCount - 1].slotObjectType = XGL_SLOT_SHADER_RESOURCE;
ps_stage.shader.descriptorSetMapping[0].pDescriptorInfo = (const XGL_DESCRIPTOR_SLOT_INFO*) slotInfo; ps_stage.shader.descriptorSetMapping[0].pDescriptorInfo = (const XGL_DESCRIPTOR_SLOT_INFO*) slotInfo;
ps_stage.shader.descriptorSetMapping[0].descriptorCount = bufferCount; ps_stage.shader.descriptorSetMapping[0].descriptorCount = bufferCount;
@ -1261,15 +1264,20 @@ void XglRenderTest::CreatePipelineMultipleTexturesAndSamplers(XGL_PIPELINE* pipe
// Assign the slots, note that only t0 and s0 will work as of writing this test // Assign the slots, note that only t0 and s0 will work as of writing this test
XGL_DESCRIPTOR_SLOT_INFO *slotInfo = (XGL_DESCRIPTOR_SLOT_INFO*) malloc( psSlots * sizeof(XGL_DESCRIPTOR_SLOT_INFO) ); XGL_DESCRIPTOR_SLOT_INFO *slotInfo = (XGL_DESCRIPTOR_SLOT_INFO*) malloc( psSlots * sizeof(XGL_DESCRIPTOR_SLOT_INFO) );
int slotIndex = 0; int slotIndex = 0;
for (int i = 0; i < textureCount; ++i) { for (int i = 0; i < textureCount - 1; ++i) {
slotInfo[slotIndex].shaderEntityIndex = i; slotInfo[slotIndex].shaderEntityIndex = i;
slotInfo[slotIndex++].slotObjectType = XGL_SLOT_SHADER_RESOURCE; slotInfo[slotIndex++].slotObjectType = XGL_SLOT_SHADER_RESOURCE;
} }
for (int i = 0; i < samplerCount; ++i) { slotInfo[slotIndex].shaderEntityIndex = 12;
slotInfo[slotIndex++].slotObjectType = XGL_SLOT_SHADER_RESOURCE;
for (int i = 0; i < samplerCount - 1; ++i) {
slotInfo[slotIndex].shaderEntityIndex = i; slotInfo[slotIndex].shaderEntityIndex = i;
slotInfo[slotIndex++].slotObjectType = XGL_SLOT_SHADER_SAMPLER; slotInfo[slotIndex++].slotObjectType = XGL_SLOT_SHADER_SAMPLER;
} }
slotInfo[slotIndex].shaderEntityIndex = 12;
slotInfo[slotIndex++].slotObjectType = XGL_SLOT_SHADER_SAMPLER;
vs_stage.sType = XGL_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO; vs_stage.sType = XGL_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO;
vs_stage.pNext = XGL_NULL_HANDLE; vs_stage.pNext = XGL_NULL_HANDLE;
vs_stage.shader.stage = XGL_SHADER_STAGE_VERTEX; vs_stage.shader.stage = XGL_SHADER_STAGE_VERTEX;
@ -1915,7 +1923,7 @@ TEST_F(XglRenderTest, SamplerBindingsTriangle)
"layout (location = 0) in vec4 samplePos;\n" "layout (location = 0) in vec4 samplePos;\n"
"layout (binding = 0) uniform sampler2D surface0;\n" "layout (binding = 0) uniform sampler2D surface0;\n"
"layout (binding = 1) uniform sampler2D surface1;\n" "layout (binding = 1) uniform sampler2D surface1;\n"
"layout (binding = 2) uniform sampler2D surface2;\n" "layout (binding = 12) uniform sampler2D surface2;\n"
"void main() {\n" "void main() {\n"
" gl_FragColor = textureLod(surface2, samplePos.xy, 0.0);\n" " gl_FragColor = textureLod(surface2, samplePos.xy, 0.0);\n"
"}\n"; "}\n";
@ -1992,7 +2000,7 @@ TEST_F(XglRenderTest, TriangleFSUniformBlockBinding)
"layout (std140, binding = 0) uniform redVal { vec4 color; } myRedVal\n;" "layout (std140, binding = 0) uniform redVal { vec4 color; } myRedVal\n;"
"layout (std140, binding = 1) uniform greenVal { vec4 color; } myGreenVal\n;" "layout (std140, binding = 1) uniform greenVal { vec4 color; } myGreenVal\n;"
"layout (std140, binding = 2) uniform blueVal { vec4 color; } myBlueVal\n;" "layout (std140, binding = 2) uniform blueVal { vec4 color; } myBlueVal\n;"
"layout (std140, binding = 3) uniform whiteVal { vec4 color; } myWhiteVal\n;" "layout (std140, binding = 18) uniform whiteVal { vec4 color; } myWhiteVal\n;"
"void main() {\n" "void main() {\n"
" gl_FragColor = myBlueVal.color;\n" " gl_FragColor = myBlueVal.color;\n"
" gl_FragColor += myRedVal.color;\n" " gl_FragColor += myRedVal.color;\n"
@ -2002,6 +2010,43 @@ TEST_F(XglRenderTest, TriangleFSUniformBlockBinding)
DrawTriangleFSUniformBlockBinding(vertShaderText, fragShaderText); DrawTriangleFSUniformBlockBinding(vertShaderText, fragShaderText);
} }
TEST_F(XglRenderTest, TriangleFSAnonymousUniformBlockBinding)
{
// This test is the same as TriangleFSUniformBlockBinding, but
// it does not provide an instance name.
// The expected result from this test is a purple triangle
static const char *vertShaderText =
"#version 140\n"
"#extension GL_ARB_separate_shader_objects : enable\n"
"#extension GL_ARB_shading_language_420pack : enable\n"
"void main() {\n"
" vec2 vertices[3];"
" vertices[0] = vec2(-0.5, -0.5);\n"
" vertices[1] = vec2( 0.5, -0.5);\n"
" vertices[2] = vec2( 0.5, 0.5);\n"
" gl_Position = vec4(vertices[gl_VertexID % 3], 0.0, 1.0);\n"
"}\n";
static const char *fragShaderText =
"#version 430\n"
"#extension GL_ARB_separate_shader_objects : enable\n"
"#extension GL_ARB_shading_language_420pack : enable\n"
"layout (location = 0) uniform vec4 foo;\n"
"layout (location = 1) uniform vec4 bar;\n"
"layout (std140, binding = 0) uniform redVal { vec4 red; };"
"layout (std140, binding = 1) uniform greenVal { vec4 green; };"
"layout (std140, binding = 2) uniform blueVal { vec4 blue; };"
"layout (std140, binding = 18) uniform whiteVal { vec4 white; };"
"void main() {\n"
" gl_FragColor = blue;\n"
" gl_FragColor += red;\n"
"}\n";
XglTestFramework::m_use_bil = true;
DrawTriangleFSUniformBlockBinding(vertShaderText, fragShaderText);
}
int main(int argc, char **argv) { int main(int argc, char **argv) {
int result; int result;