openharmony/third_party_vulkan-loader
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_vulkan-loader synced 2024-12-19 21:38:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

compiler_render_tests: Clean up single texture test a bit

Browse Source
This commit is contained in:
Cody Northrop 2014-10-20 11:51:32 -06:00 committed by Courtney Goeltzenleuchter
parent 7f3ce56a9c
commit 9a901c0b65
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/compiler_render_tests.cpp
View File

@ -661,7 +661,7 @@ void XglRenderTest::DrawTexturedTriangle(const char *vertShaderText, const char
ASSERT_NO_FATAL_FAILURE(InitTexture());
// Create descriptor set for a texture and sampler resources
const int slotCount = 3;
const int slotCount = 2;
XGL_DESCRIPTOR_SET_CREATE_INFO descriptorInfo = {};
descriptorInfo.sType = XGL_STRUCTURE_TYPE_DESCRIPTOR_SET_CREATE_INFO;
descriptorInfo.slots = slotCount;
@ -1294,10 +1294,6 @@ void XglRenderTest::CreatePipelineSingleTextureAndSampler(XGL_PIPELINE* pipeline
ASSERT_XGL_SUCCESS(err) << "xglCreateDescriptorSet failed";
err = m_device->AllocAndBindGpuMemory(m_rsrcDescSet, "DescriptorSet", &m_descriptor_set_mem);
//XXXXXX
// Texture must be first, followed by sampler (VALIDATED THIS BEFORE SUBMITTING COMMENT)
//XXXXXX
// 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) );
slotInfo[0].shaderEntityIndex = 0;
@ -1979,6 +1975,7 @@ TEST_F(XglRenderTest, TriangleVSFSUniformBlock)
TEST_F(XglRenderTest, TexturedTriangle)
{
// The expected result from this test is a red and green checkered triangle
static const char *vertShaderText =
"#version 130\n"
"out vec2 samplePos;\n"