From e6c9625e0f0d5d9703451fd2ebb8b206d210009c Mon Sep 17 00:00:00 2001 From: Yong He Date: Mon, 28 Feb 2022 18:09:27 -0800 Subject: Use GLSL scalar layout for constant buffers. (#2147) --- source/slang/slang-emit-glsl.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'source/slang/slang-emit-glsl.cpp') diff --git a/source/slang/slang-emit-glsl.cpp b/source/slang/slang-emit-glsl.cpp index 44326a18e..044f93569 100644 --- a/source/slang/slang-emit-glsl.cpp +++ b/source/slang/slang-emit-glsl.cpp @@ -290,14 +290,18 @@ void GLSLSourceEmitter::_emitGLSLParameterGroup(IRGlobalParam* varDecl, IRUnifor } else if (as(type)) { - // Is writable - m_writer->emit("layout(std430) buffer "); + // Is writable + m_writer->emit("layout("); + m_writer->emit(m_targetRequest->getForceGLSLScalarBufferLayout() ? "scalar" : "std430"); + m_writer->emit(") buffer "); } // TODO: what to do with HLSL `tbuffer` style buffers? else { // uniform is implicitly read only - m_writer->emit("layout(std140) uniform "); + m_writer->emit("layout("); + m_writer->emit(m_targetRequest->getForceGLSLScalarBufferLayout() ? "scalar" : "std140"); + m_writer->emit(") uniform "); } // Generate a dummy name for the block -- cgit v1.2.3