diff options
| author | Tapani Pälli <[email protected]> | 2015-09-01 13:53:43 +0300 |
|---|---|---|
| committer | Tapani Pälli <[email protected]> | 2015-09-17 08:26:33 +0300 |
| commit | d9689be5c67e71518ef8687fd7fc4bc6df25b93f (patch) | |
| tree | f99253de2c0910bbc6344b7df65c3247ac5f3c7e /src/mesa/main/shaderapi.c | |
| parent | 8f1ae9abeba6b6eaf0c14f4c78c674e5afbc38aa (diff) | |
mesa: return initial value for PROGRAM_SEPARABLE when not linked
From OpenGL ES 3.1 spec (7.12):
"Most properties set within program objects are specified not to
take effect until the next call to LinkProgram or ProgramBinary.
Some properties further require a successful call to either of
these commands before taking effect. GetProgramiv returns the
properties currently in effect for program, which may differ from
the properties set within program since the most recent call to
LinkProgram or ProgramBinary, which have not yet taken effect. If
there has been no such call putting changes to pname into effect,
initial values are returned."
Signed-off-by: Tapani Pälli <[email protected]>
Reviewed-by: Marta Lofstedt <[email protected]>
Diffstat (limited to 'src/mesa/main/shaderapi.c')
| -rw-r--r-- | src/mesa/main/shaderapi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c index 7680b5875b2..f31980b40d9 100644 --- a/src/mesa/main/shaderapi.c +++ b/src/mesa/main/shaderapi.c @@ -771,7 +771,8 @@ get_programiv(struct gl_context *ctx, GLuint program, GLenum pname, return; } case GL_PROGRAM_SEPARABLE: - *params = shProg->SeparateShader; + /* If the program has not been linked, return initial value 0. */ + *params = (shProg->LinkStatus == GL_FALSE) ? 0 : shProg->SeparateShader; return; /* ARB_tessellation_shader */ |