fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 13:10:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

main: add binary support to ProgramBinary

Browse source 
V2: call generic mesa_program_binary() helper rather than driver
    function directly to allow greater code sharing.

Signed-off-by: Timothy Arceri <tarceri@itsqueeze.com>
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com> (v1)
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com> (v1)
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
This commit is contained in:
Jordan Justen 2017-11-04 16:47:54 -07:00 • committed by Timothy Arceri
parent 7ee54ad057
commit 50c09a648f
1 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/mesa/main/shaderapi.c
View file

@ -2221,9 +2221,6 @@ _mesa_ProgramBinary(GLuint program, GLenum binaryFormat,
if (!shProg)
return;
(void) binaryFormat;
(void) binary;
/* Section 2.3.1 (Errors) of the OpenGL 4.5 spec says:
*
* "If a negative number is provided where an argument of type sizei or
@ -2234,20 +2231,25 @@ _mesa_ProgramBinary(GLuint program, GLenum binaryFormat,
return;
}
/* The ARB_get_program_binary spec says:
*
* "<binaryFormat> and <binary> must be those returned by a previous
* call to GetProgramBinary, and <length> must be the length of the
* program binary as returned by GetProgramBinary or GetProgramiv with
* <pname> PROGRAM_BINARY_LENGTH. Loading the program binary will fail,
* setting the LINK_STATUS of <program> to FALSE, if these conditions
* are not met."
*
* Since any value of binaryFormat passed "is not one of those specified as
* allowable for [this] command, an INVALID_ENUM error is generated."
*/
shProg->data->LinkStatus = linking_failure;
_mesa_error(ctx, GL_INVALID_ENUM, "glProgramBinary");
if (ctx->Const.NumProgramBinaryFormats == 0 ||
binaryFormat != GL_PROGRAM_BINARY_FORMAT_MESA) {
/* The ARB_get_program_binary spec says:
*
* "<binaryFormat> and <binary> must be those returned by a previous
* call to GetProgramBinary, and <length> must be the length of the
* program binary as returned by GetProgramBinary or GetProgramiv with
* <pname> PROGRAM_BINARY_LENGTH. Loading the program binary will fail,
* setting the LINK_STATUS of <program> to FALSE, if these conditions
* are not met."
*
* Since any value of binaryFormat passed "is not one of those specified as
* allowable for [this] command, an INVALID_ENUM error is generated."
*/
shProg->data->LinkStatus = linking_failure;
_mesa_error(ctx, GL_INVALID_ENUM, "glProgramBinary");
} else {
_mesa_program_binary(ctx, shProg, binaryFormat, binary, length);
}
}