Updates for HECL support

This commit is contained in:
Jack Andersen
2015-11-15 18:29:31 -10:00
parent ddcbc102ba
commit d75c675f7a
8 changed files with 49 additions and 27 deletions

View File

@@ -295,17 +295,17 @@ struct TestApplicationCallback : IApplicationCallback
static const char* FS =
"#version 330\n"
"precision highp float;\n"
"uniform sampler2D smplr;\n"
"uniform sampler2D texs[1];\n"
"layout(location=0) out vec4 out_frag;\n"
"in vec2 out_uv;\n"
"void main()\n"
"{\n"
" out_frag = texture(smplr, out_uv);\n"
" out_frag = texture(texs[0], out_uv);\n"
"}\n";
static const char* TexNames[] = {"smplr"};
pipeline = glF->newShaderPipeline(VS, FS, 1, TexNames, BlendFactorOne, BlendFactorZero, true, true, false);
pipeline = glF->newShaderPipeline(VS, FS, 1, "texs", 0, nullptr,
BlendFactorOne, BlendFactorZero,
true, true, false);
}
#if _WIN32
else if (factory->platform() == IGraphicsDataFactory::PlatformD3D12 ||