Skip to content

A
angle
Commit a2c74985 by Jamie Madill Committed by Commit Bot
Options

Don't load binaries across client versions.

BUG=angleproject:523 Change-Id: Id54033dce15f01a0f2891533172acd8b99896e12 Reviewed-on: https://chromium-review.googlesource.com/418240 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent 92db6947
Showing with 78 additions and 62 deletions
src/libANGLE/Program.cpp
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#include "common/utilities.h" #include "common/utilities.h"
#include "common/version.h" #include "common/version.h"
#include "compiler/translator/blocklayout.h" #include "compiler/translator/blocklayout.h"
#include "libANGLE/ContextState.h" #include "libANGLE/Context.h"
#include "libANGLE/ResourceManager.h" #include "libANGLE/ResourceManager.h"
#include "libANGLE/features.h" #include "libANGLE/features.h"
#include "libANGLE/renderer/GLImplFactory.h" #include "libANGLE/renderer/GLImplFactory.h"
...@@ -283,7 +283,7 @@ const LinkedUniform *ProgramState::getUniformByName(const std::string &name) con ...@@ -283,7 +283,7 @@ const LinkedUniform *ProgramState::getUniformByName(const std::string &name) con
GLint ProgramState::getUniformLocation(const std::string &name) const GLint ProgramState::getUniformLocation(const std::string &name) const
{ {
size_t subscript = GL_INVALID_INDEX; size_t subscript = GL_INVALID_INDEX;
std::string baseName = gl::ParseUniformName(name, &subscript); std::string baseName = ParseUniformName(name, &subscript);
for (size_t location = 0; location < mUniformLocations.size(); ++location) for (size_t location = 0; location < mUniformLocations.size(); ++location)
{ {
...@@ -321,7 +321,7 @@ GLint ProgramState::getUniformLocation(const std::string &name) const ...@@ -321,7 +321,7 @@ GLint ProgramState::getUniformLocation(const std::string &name) const
GLuint ProgramState::getUniformIndex(const std::string &name) const GLuint ProgramState::getUniformIndex(const std::string &name) const
{ {
size_t subscript = GL_INVALID_INDEX; size_t subscript = GL_INVALID_INDEX;
std::string baseName = gl::ParseUniformName(name, &subscript); std::string baseName = ParseUniformName(name, &subscript);
// The app is not allowed to specify array indices other than 0 for arrays of basic types // The app is not allowed to specify array indices other than 0 for arrays of basic types
if (subscript != 0 && subscript != GL_INVALID_INDEX) if (subscript != 0 && subscript != GL_INVALID_INDEX)
...@@ -710,7 +710,10 @@ bool Program::isLinked() const ...@@ -710,7 +710,10 @@ bool Program::isLinked() const
return mLinked; return mLinked;
} }
Error Program::loadBinary(GLenum binaryFormat, const void *binary, GLsizei length) Error Program::loadBinary(const Context *context,
GLenum binaryFormat,
const void *binary,
GLsizei length)
{ {
unlink(false); unlink(false);
...@@ -726,19 +729,21 @@ Error Program::loadBinary(GLenum binaryFormat, const void *binary, GLsizei lengt ...@@ -726,19 +729,21 @@ Error Program::loadBinary(GLenum binaryFormat, const void *binary, GLsizei lengt
BinaryInputStream stream(binary, length); BinaryInputStream stream(binary, length);
int majorVersion = stream.readInt<int>(); unsigned char commitString[ANGLE_COMMIT_HASH_SIZE];
int minorVersion = stream.readInt<int>(); stream.readBytes(commitString, ANGLE_COMMIT_HASH_SIZE);
if (majorVersion != ANGLE_MAJOR_VERSION || minorVersion != ANGLE_MINOR_VERSION) if (memcmp(commitString, ANGLE_COMMIT_HASH, sizeof(unsigned char) * ANGLE_COMMIT_HASH_SIZE) !=
0)
{ {
mInfoLog << "Invalid program binary version."; mInfoLog << "Invalid program binary version.";
return Error(GL_NO_ERROR); return Error(GL_NO_ERROR);
} }
unsigned char commitString[ANGLE_COMMIT_HASH_SIZE]; int majorVersion = stream.readInt<int>();
stream.readBytes(commitString, ANGLE_COMMIT_HASH_SIZE); int minorVersion = stream.readInt<int>();
if (memcmp(commitString, ANGLE_COMMIT_HASH, sizeof(unsigned char) * ANGLE_COMMIT_HASH_SIZE) != 0) if (majorVersion != context->getClientMajorVersion() ||
minorVersion != context->getClientMinorVersion())
{ {
mInfoLog << "Invalid program binary version."; mInfoLog << "Cannot load program binaries across different ES context versions.";
return Error(GL_NO_ERROR); return Error(GL_NO_ERROR);
} }
...@@ -849,7 +854,11 @@ Error Program::loadBinary(GLenum binaryFormat, const void *binary, GLsizei lengt ...@@ -849,7 +854,11 @@ Error Program::loadBinary(GLenum binaryFormat, const void *binary, GLsizei lengt
#endif // #if ANGLE_PROGRAM_BINARY_LOAD == ANGLE_ENABLED #endif // #if ANGLE_PROGRAM_BINARY_LOAD == ANGLE_ENABLED
} }
Error Program::saveBinary(GLenum *binaryFormat, void *binary, GLsizei bufSize, GLsizei *length) const Error Program::saveBinary(const Context *context,
GLenum *binaryFormat,
void *binary,
GLsizei bufSize,
GLsizei *length) const
{ {
if (binaryFormat) if (binaryFormat)
{ {
...@@ -858,10 +867,20 @@ Error Program::saveBinary(GLenum *binaryFormat, void *binary, GLsizei bufSize, G ...@@ -858,10 +867,20 @@ Error Program::saveBinary(GLenum *binaryFormat, void *binary, GLsizei bufSize, G
BinaryOutputStream stream; BinaryOutputStream stream;
stream.writeInt(ANGLE_MAJOR_VERSION);
stream.writeInt(ANGLE_MINOR_VERSION);
stream.writeBytes(reinterpret_cast<const unsigned char*>(ANGLE_COMMIT_HASH), ANGLE_COMMIT_HASH_SIZE); stream.writeBytes(reinterpret_cast<const unsigned char*>(ANGLE_COMMIT_HASH), ANGLE_COMMIT_HASH_SIZE);
// nullptr context is supported when computing binary length.
if (context)
{
stream.writeInt(context->getClientVersion().major);
stream.writeInt(context->getClientVersion().minor);
}
else
{
stream.writeInt(2);
stream.writeInt(0);
}
stream.writeInt(mState.mComputeShaderLocalSize[0]); stream.writeInt(mState.mComputeShaderLocalSize[0]);
stream.writeInt(mState.mComputeShaderLocalSize[1]); stream.writeInt(mState.mComputeShaderLocalSize[1]);
stream.writeInt(mState.mComputeShaderLocalSize[2]); stream.writeInt(mState.mComputeShaderLocalSize[2]);
...@@ -876,7 +895,7 @@ Error Program::saveBinary(GLenum *binaryFormat, void *binary, GLsizei bufSize, G ...@@ -876,7 +895,7 @@ Error Program::saveBinary(GLenum *binaryFormat, void *binary, GLsizei bufSize, G
} }
stream.writeInt(mState.mUniforms.size()); stream.writeInt(mState.mUniforms.size());
for (const gl::LinkedUniform &uniform : mState.mUniforms) for (const LinkedUniform &uniform : mState.mUniforms)
{ {
WriteShaderVar(&stream, uniform); WriteShaderVar(&stream, uniform);
...@@ -939,11 +958,7 @@ Error Program::saveBinary(GLenum *binaryFormat, void *binary, GLsizei bufSize, G ...@@ -939,11 +958,7 @@ Error Program::saveBinary(GLenum *binaryFormat, void *binary, GLsizei bufSize, G
stream.writeInt(mSamplerUniformRange.start); stream.writeInt(mSamplerUniformRange.start);
stream.writeInt(mSamplerUniformRange.end); stream.writeInt(mSamplerUniformRange.end);
gl::Error error = mProgram->save(&stream); ANGLE_TRY(mProgram->save(&stream));
if (error.isError())
{
return error;
}
GLsizei streamLength = static_cast<GLsizei>(stream.length()); GLsizei streamLength = static_cast<GLsizei>(stream.length());
const void *streamState = stream.data(); const void *streamState = stream.data();
...@@ -982,7 +997,7 @@ Error Program::saveBinary(GLenum *binaryFormat, void *binary, GLsizei bufSize, G ...@@ -982,7 +997,7 @@ Error Program::saveBinary(GLenum *binaryFormat, void *binary, GLsizei bufSize, G
GLint Program::getBinaryLength() const GLint Program::getBinaryLength() const
{ {
GLint length; GLint length;
Error error = saveBinary(nullptr, nullptr, std::numeric_limits<GLint>::max(), &length); Error error = saveBinary(nullptr, nullptr, nullptr, std::numeric_limits<GLint>::max(), &length);
if (error.isError()) if (error.isError())
{ {
return 0; return 0;
...@@ -1284,7 +1299,7 @@ GLint Program::getActiveUniformMaxLength() const ...@@ -1284,7 +1299,7 @@ GLint Program::getActiveUniformMaxLength() const
GLint Program::getActiveUniformi(GLuint index, GLenum pname) const GLint Program::getActiveUniformi(GLuint index, GLenum pname) const
{ {
ASSERT(static_cast<size_t>(index) < mState.mUniforms.size()); ASSERT(static_cast<size_t>(index) < mState.mUniforms.size());
const gl::LinkedUniform &uniform = mState.mUniforms[index]; const LinkedUniform &uniform = mState.mUniforms[index];
switch (pname) switch (pname)
{ {
case GL_UNIFORM_TYPE: return static_cast<GLint>(uniform.type); case GL_UNIFORM_TYPE: return static_cast<GLint>(uniform.type);
...@@ -1640,12 +1655,12 @@ GLint Program::getActiveUniformBlockMaxLength() const ...@@ -1640,12 +1655,12 @@ GLint Program::getActiveUniformBlockMaxLength() const
GLuint Program::getUniformBlockIndex(const std::string &name) const GLuint Program::getUniformBlockIndex(const std::string &name) const
{ {
size_t subscript = GL_INVALID_INDEX; size_t subscript = GL_INVALID_INDEX;
std::string baseName = gl::ParseUniformName(name, &subscript); std::string baseName = ParseUniformName(name, &subscript);
unsigned int numUniformBlocks = static_cast<unsigned int>(mState.mUniformBlocks.size()); unsigned int numUniformBlocks = static_cast<unsigned int>(mState.mUniformBlocks.size());
for (unsigned int blockIndex = 0; blockIndex < numUniformBlocks; blockIndex++) for (unsigned int blockIndex = 0; blockIndex < numUniformBlocks; blockIndex++)
{ {
const gl::UniformBlock &uniformBlock = mState.mUniformBlocks[blockIndex]; const UniformBlock &uniformBlock = mState.mUniformBlocks[blockIndex];
if (uniformBlock.name == baseName) if (uniformBlock.name == baseName)
{ {
const bool arrayElementZero = const bool arrayElementZero =
...@@ -1862,9 +1877,7 @@ bool Program::validateVertexAndFragmentUniforms(InfoLog &infoLog) const ...@@ -1862,9 +1877,7 @@ bool Program::validateVertexAndFragmentUniforms(InfoLog &infoLog) const
return true; return true;
} }
bool Program::linkUniforms(gl::InfoLog &infoLog, bool Program::linkUniforms(InfoLog &infoLog, const Caps &caps, const Bindings &uniformBindings)
const gl::Caps &caps,
const Bindings &uniformBindings)
{ {
if (mState.mAttachedVertexShader && mState.mAttachedFragmentShader) if (mState.mAttachedVertexShader && mState.mAttachedFragmentShader)
{ {
...@@ -1890,9 +1903,7 @@ bool Program::linkUniforms(gl::InfoLog &infoLog, ...@@ -1890,9 +1903,7 @@ bool Program::linkUniforms(gl::InfoLog &infoLog,
return true; return true;
} }
bool Program::indexUniforms(gl::InfoLog &infoLog, bool Program::indexUniforms(InfoLog &infoLog, const Caps &caps, const Bindings &uniformBindings)
const gl::Caps &caps,
const Bindings &uniformBindings)
{ {
// Uniforms awaiting a location // Uniforms awaiting a location
std::vector<VariableLocation> unboundUniforms; std::vector<VariableLocation> unboundUniforms;
...@@ -1902,7 +1913,7 @@ bool Program::indexUniforms(gl::InfoLog &infoLog, ...@@ -1902,7 +1913,7 @@ bool Program::indexUniforms(gl::InfoLog &infoLog,
// Gather bound and unbound uniforms // Gather bound and unbound uniforms
for (size_t uniformIndex = 0; uniformIndex < mState.mUniforms.size(); uniformIndex++) for (size_t uniformIndex = 0; uniformIndex < mState.mUniforms.size(); uniformIndex++)
{ {
const gl::LinkedUniform &uniform = mState.mUniforms[uniformIndex]; const LinkedUniform &uniform = mState.mUniforms[uniformIndex];
if (uniform.isBuiltIn()) if (uniform.isBuiltIn())
{ {
...@@ -2204,7 +2215,7 @@ bool Program::linkUniformBlocks(InfoLog &infoLog, const Caps &caps) ...@@ -2204,7 +2215,7 @@ bool Program::linkUniformBlocks(InfoLog &infoLog, const Caps &caps)
return true; return true;
} }
bool Program::areMatchingInterfaceBlocks(gl::InfoLog &infoLog, bool Program::areMatchingInterfaceBlocks(InfoLog &infoLog,
const sh::InterfaceBlock &vertexInterfaceBlock, const sh::InterfaceBlock &vertexInterfaceBlock,
const sh::InterfaceBlock &fragmentInterfaceBlock) const const sh::InterfaceBlock &fragmentInterfaceBlock) const
{ {
...@@ -2376,7 +2387,7 @@ bool Program::linkValidateTransformFeedback(InfoLog &infoLog, ...@@ -2376,7 +2387,7 @@ bool Program::linkValidateTransformFeedback(InfoLog &infoLog,
} }
// TODO(jmadill): Investigate implementation limits on D3D11 // TODO(jmadill): Investigate implementation limits on D3D11
size_t componentCount = gl::VariableComponentCount(varying->type); size_t componentCount = VariableComponentCount(varying->type);
if (mState.mTransformFeedbackBufferMode == GL_SEPARATE_ATTRIBS && if (mState.mTransformFeedbackBufferMode == GL_SEPARATE_ATTRIBS &&
componentCount > caps.maxTransformFeedbackSeparateComponents) componentCount > caps.maxTransformFeedbackSeparateComponents)
{ {
...@@ -2496,7 +2507,7 @@ void Program::linkOutputVariables() ...@@ -2496,7 +2507,7 @@ void Program::linkOutputVariables()
} }
} }
bool Program::flattenUniformsAndCheckCapsForShader(const gl::Shader &shader, bool Program::flattenUniformsAndCheckCapsForShader(const Shader &shader,
GLuint maxUniformComponents, GLuint maxUniformComponents,
GLuint maxTextureImageUnits, GLuint maxTextureImageUnits,
const std::string &componentsErrorMessage, const std::string &componentsErrorMessage,
...@@ -2534,7 +2545,7 @@ bool Program::flattenUniformsAndCheckCaps(const Caps &caps, InfoLog &infoLog) ...@@ -2534,7 +2545,7 @@ bool Program::flattenUniformsAndCheckCaps(const Caps &caps, InfoLog &infoLog)
if (mState.mAttachedComputeShader) if (mState.mAttachedComputeShader)
{ {
const gl::Shader *computeShader = mState.getAttachedComputeShader(); const Shader *computeShader = mState.getAttachedComputeShader();
// TODO (mradev): check whether we need finer-grained component counting // TODO (mradev): check whether we need finer-grained component counting
if (!flattenUniformsAndCheckCapsForShader( if (!flattenUniformsAndCheckCapsForShader(
...@@ -2549,7 +2560,7 @@ bool Program::flattenUniformsAndCheckCaps(const Caps &caps, InfoLog &infoLog) ...@@ -2549,7 +2560,7 @@ bool Program::flattenUniformsAndCheckCaps(const Caps &caps, InfoLog &infoLog)
} }
else else
{ {
const gl::Shader *vertexShader = mState.getAttachedVertexShader(); const Shader *vertexShader = mState.getAttachedVertexShader();
if (!flattenUniformsAndCheckCapsForShader( if (!flattenUniformsAndCheckCapsForShader(
*vertexShader, caps.maxVertexUniformVectors, caps.maxVertexTextureImageUnits, *vertexShader, caps.maxVertexUniformVectors, caps.maxVertexTextureImageUnits,
...@@ -2559,7 +2570,7 @@ bool Program::flattenUniformsAndCheckCaps(const Caps &caps, InfoLog &infoLog) ...@@ -2559,7 +2570,7 @@ bool Program::flattenUniformsAndCheckCaps(const Caps &caps, InfoLog &infoLog)
{ {
return false; return false;
} }
const gl::Shader *fragmentShader = mState.getAttachedFragmentShader(); const Shader *fragmentShader = mState.getAttachedFragmentShader();
if (!flattenUniformsAndCheckCapsForShader( if (!flattenUniformsAndCheckCapsForShader(
*fragmentShader, caps.maxFragmentUniformVectors, caps.maxTextureImageUnits, *fragmentShader, caps.maxFragmentUniformVectors, caps.maxTextureImageUnits,
...@@ -2609,9 +2620,8 @@ Program::VectorAndSamplerCount Program::flattenUniform(const sh::ShaderVariable ...@@ -2609,9 +2620,8 @@ Program::VectorAndSamplerCount Program::flattenUniform(const sh::ShaderVariable
if (!UniformInList(mState.getUniforms(), fullName) && if (!UniformInList(mState.getUniforms(), fullName) &&
!UniformInList(*samplerUniforms, fullName)) !UniformInList(*samplerUniforms, fullName))
{ {
gl::LinkedUniform linkedUniform(uniform.type, uniform.precision, fullName, LinkedUniform linkedUniform(uniform.type, uniform.precision, fullName, uniform.arraySize,
uniform.arraySize, -1, -1, sh::BlockMemberInfo::getDefaultBlockInfo());
sh::BlockMemberInfo::getDefaultBlockInfo());
linkedUniform.staticUse = true; linkedUniform.staticUse = true;
// Store sampler uniforms separately, so we'll append them to the end of the list. // Store sampler uniforms separately, so we'll append them to the end of the list.
...@@ -2642,7 +2652,7 @@ void Program::gatherInterfaceBlockInfo() ...@@ -2642,7 +2652,7 @@ void Program::gatherInterfaceBlockInfo()
if (mState.mAttachedComputeShader) if (mState.mAttachedComputeShader)
{ {
const gl::Shader *computeShader = mState.getAttachedComputeShader(); const Shader *computeShader = mState.getAttachedComputeShader();
for (const sh::InterfaceBlock &computeBlock : computeShader->getInterfaceBlocks()) for (const sh::InterfaceBlock &computeBlock : computeShader->getInterfaceBlocks())
{ {
...@@ -2651,7 +2661,7 @@ void Program::gatherInterfaceBlockInfo() ...@@ -2651,7 +2661,7 @@ void Program::gatherInterfaceBlockInfo()
if (!computeBlock.staticUse && computeBlock.layout == sh::BLOCKLAYOUT_PACKED) if (!computeBlock.staticUse && computeBlock.layout == sh::BLOCKLAYOUT_PACKED)
continue; continue;
for (gl::UniformBlock &block : mState.mUniformBlocks) for (UniformBlock &block : mState.mUniformBlocks)
{ {
if (block.name == computeBlock.name) if (block.name == computeBlock.name)
{ {
...@@ -2666,7 +2676,7 @@ void Program::gatherInterfaceBlockInfo() ...@@ -2666,7 +2676,7 @@ void Program::gatherInterfaceBlockInfo()
std::set<std::string> visitedList; std::set<std::string> visitedList;
const gl::Shader *vertexShader = mState.getAttachedVertexShader(); const Shader *vertexShader = mState.getAttachedVertexShader();
for (const sh::InterfaceBlock &vertexBlock : vertexShader->getInterfaceBlocks()) for (const sh::InterfaceBlock &vertexBlock : vertexShader->getInterfaceBlocks())
{ {
...@@ -2681,7 +2691,7 @@ void Program::gatherInterfaceBlockInfo() ...@@ -2681,7 +2691,7 @@ void Program::gatherInterfaceBlockInfo()
visitedList.insert(vertexBlock.name); visitedList.insert(vertexBlock.name);
} }
const gl::Shader *fragmentShader = mState.getAttachedFragmentShader(); const Shader *fragmentShader = mState.getAttachedFragmentShader();
for (const sh::InterfaceBlock &fragmentBlock : fragmentShader->getInterfaceBlocks()) for (const sh::InterfaceBlock &fragmentBlock : fragmentShader->getInterfaceBlocks())
{ {
...@@ -2691,7 +2701,7 @@ void Program::gatherInterfaceBlockInfo() ...@@ -2691,7 +2701,7 @@ void Program::gatherInterfaceBlockInfo()
if (visitedList.count(fragmentBlock.name) > 0) if (visitedList.count(fragmentBlock.name) > 0)
{ {
for (gl::UniformBlock &block : mState.mUniformBlocks) for (UniformBlock &block : mState.mUniformBlocks)
{ {
if (block.name == fragmentBlock.name) if (block.name == fragmentBlock.name)
{ {
...@@ -2957,4 +2967,4 @@ void Program::getUniformInternal(GLint location, DestT *dataOut) const ...@@ -2957,4 +2967,4 @@ void Program::getUniformInternal(GLint location, DestT *dataOut) const
UNREACHABLE(); UNREACHABLE();
} }
} }
} } // namespace gl
src/libANGLE/Program.h
...@@ -39,6 +39,7 @@ struct TranslatedAttribute; ...@@ -39,6 +39,7 @@ struct TranslatedAttribute;
namespace gl namespace gl
{ {
struct Caps; struct Caps;
class Context;
class ContextState; class ContextState;
class ResourceManager; class ResourceManager;
class Shader; class Shader;
...@@ -266,8 +267,15 @@ class Program final : angle::NonCopyable, public LabeledObject ...@@ -266,8 +267,15 @@ class Program final : angle::NonCopyable, public LabeledObject
Error link(const ContextState &data); Error link(const ContextState &data);
bool isLinked() const; bool isLinked() const;
Error loadBinary(GLenum binaryFormat, const void *binary, GLsizei length); Error loadBinary(const Context *context,
Error saveBinary(GLenum *binaryFormat, void *binary, GLsizei bufSize, GLsizei *length) const; GLenum binaryFormat,
const void *binary,
GLsizei length);
Error saveBinary(const Context *context,
GLenum *binaryFormat,
void *binary,
GLsizei bufSize,
GLsizei *length) const;
GLint getBinaryLength() const; GLint getBinaryLength() const;
void setBinaryRetrievableHint(bool retrievable); void setBinaryRetrievableHint(bool retrievable);
bool getBinaryRetrievableHint() const; bool getBinaryRetrievableHint() const;
...@@ -392,9 +400,9 @@ class Program final : angle::NonCopyable, public LabeledObject ...@@ -392,9 +400,9 @@ class Program final : angle::NonCopyable, public LabeledObject
bool linkUniformBlocks(InfoLog &infoLog, const Caps &caps); bool linkUniformBlocks(InfoLog &infoLog, const Caps &caps);
bool linkVaryings(InfoLog &infoLog, const Shader *vertexShader, const Shader *fragmentShader) const; bool linkVaryings(InfoLog &infoLog, const Shader *vertexShader, const Shader *fragmentShader) const;
bool validateVertexAndFragmentUniforms(InfoLog &infoLog) const; bool validateVertexAndFragmentUniforms(InfoLog &infoLog) const;
bool linkUniforms(gl::InfoLog &infoLog, const gl::Caps &caps, const Bindings &uniformBindings); bool linkUniforms(InfoLog &infoLog, const Caps &caps, const Bindings &uniformBindings);
bool indexUniforms(gl::InfoLog &infoLog, const gl::Caps &caps, const Bindings &uniformBindings); bool indexUniforms(InfoLog &infoLog, const Caps &caps, const Bindings &uniformBindings);
bool areMatchingInterfaceBlocks(gl::InfoLog &infoLog, bool areMatchingInterfaceBlocks(InfoLog &infoLog,
const sh::InterfaceBlock &vertexInterfaceBlock, const sh::InterfaceBlock &vertexInterfaceBlock,
const sh::InterfaceBlock &fragmentInterfaceBlock) const; const sh::InterfaceBlock &fragmentInterfaceBlock) const;
...@@ -420,7 +428,7 @@ class Program final : angle::NonCopyable, public LabeledObject ...@@ -420,7 +428,7 @@ class Program final : angle::NonCopyable, public LabeledObject
std::vector<const sh::Varying *> getMergedVaryings() const; std::vector<const sh::Varying *> getMergedVaryings() const;
void linkOutputVariables(); void linkOutputVariables();
bool flattenUniformsAndCheckCapsForShader(const gl::Shader &shader, bool flattenUniformsAndCheckCapsForShader(const Shader &shader,
GLuint maxUniformComponents, GLuint maxUniformComponents,
GLuint maxTextureImageUnits, GLuint maxTextureImageUnits,
const std::string &componentsErrorMessage, const std::string &componentsErrorMessage,
...@@ -497,6 +505,6 @@ class Program final : angle::NonCopyable, public LabeledObject ...@@ -497,6 +505,6 @@ class Program final : angle::NonCopyable, public LabeledObject
std::vector<GLenum> mTextureUnitTypesCache; std::vector<GLenum> mTextureUnitTypesCache;
RangeUI mSamplerUniformRange; RangeUI mSamplerUniformRange;
}; };
} } // namespace gl
#endif // LIBANGLE_PROGRAM_H_ #endif // LIBANGLE_PROGRAM_H_
src/libGLESv2/entry_points_gles_2_0_ext.cpp
...@@ -768,7 +768,7 @@ void GL_APIENTRY GetProgramBinaryOES(GLuint program, GLsizei bufSize, GLsizei *l ...@@ -768,7 +768,7 @@ void GL_APIENTRY GetProgramBinaryOES(GLuint program, GLsizei bufSize, GLsizei *l
Program *programObject = context->getProgram(program); Program *programObject = context->getProgram(program);
ASSERT(programObject != nullptr); ASSERT(programObject != nullptr);
Error error = programObject->saveBinary(binaryFormat, binary, bufSize, length); Error error = programObject->saveBinary(context, binaryFormat, binary, bufSize, length);
if (error.isError()) if (error.isError())
{ {
context->handleError(error); context->handleError(error);
...@@ -793,7 +793,7 @@ void GL_APIENTRY ProgramBinaryOES(GLuint program, GLenum binaryFormat, const voi ...@@ -793,7 +793,7 @@ void GL_APIENTRY ProgramBinaryOES(GLuint program, GLenum binaryFormat, const voi
Program *programObject = context->getProgram(program); Program *programObject = context->getProgram(program);
ASSERT(programObject != nullptr); ASSERT(programObject != nullptr);
Error error = programObject->loadBinary(binaryFormat, binary, length); Error error = programObject->loadBinary(context, binaryFormat, binary, length);
if (error.isError()) if (error.isError())
{ {
context->handleError(error); context->handleError(error);
......
src/libGLESv2/entry_points_gles_3_0.cpp
...@@ -2423,7 +2423,7 @@ void GL_APIENTRY GetProgramBinary(GLuint program, GLsizei bufSize, GLsizei* leng ...@@ -2423,7 +2423,7 @@ void GL_APIENTRY GetProgramBinary(GLuint program, GLsizei bufSize, GLsizei* leng
Program *programObject = context->getProgram(program); Program *programObject = context->getProgram(program);
ASSERT(programObject != nullptr); ASSERT(programObject != nullptr);
Error error = programObject->saveBinary(binaryFormat, binary, bufSize, length); Error error = programObject->saveBinary(context, binaryFormat, binary, bufSize, length);
if (error.isError()) if (error.isError())
{ {
context->handleError(error); context->handleError(error);
...@@ -2448,7 +2448,7 @@ void GL_APIENTRY ProgramBinary(GLuint program, GLenum binaryFormat, const GLvoid ...@@ -2448,7 +2448,7 @@ void GL_APIENTRY ProgramBinary(GLuint program, GLenum binaryFormat, const GLvoid
Program *programObject = context->getProgram(program); Program *programObject = context->getProgram(program);
ASSERT(programObject != nullptr); ASSERT(programObject != nullptr);
Error error = programObject->loadBinary(binaryFormat, binary, length); Error error = programObject->loadBinary(context, binaryFormat, binary, length);
if (error.isError()) if (error.isError())
{ {
context->handleError(error); context->handleError(error);
......
src/tests/gl_tests/ProgramBinaryTest.cpp
...@@ -621,6 +621,7 @@ TEST_P(ProgramBinariesAcrossPlatforms, CreateAndReloadBinary) ...@@ -621,6 +621,7 @@ TEST_P(ProgramBinariesAcrossPlatforms, CreateAndReloadBinary)
destroyEGLWindow(&eglWindow); destroyEGLWindow(&eglWindow);
} }
// clang-format off
ANGLE_INSTANTIATE_TEST(ProgramBinariesAcrossPlatforms, ANGLE_INSTANTIATE_TEST(ProgramBinariesAcrossPlatforms,
// | Save the program | Load the program | Expected // | Save the program | Load the program | Expected
// | using these params | using these params | link result // | using these params | using these params | link result
...@@ -631,9 +632,6 @@ ANGLE_INSTANTIATE_TEST(ProgramBinariesAcrossPlatforms, ...@@ -631,9 +632,6 @@ ANGLE_INSTANTIATE_TEST(ProgramBinariesAcrossPlatforms,
PlatformsWithLinkResult(ES2_D3D11_FL9_3(), ES2_D3D11_FL9_3_WARP(), false ), // Switching from hardware to software shouldn't work for FL9 either PlatformsWithLinkResult(ES2_D3D11_FL9_3(), ES2_D3D11_FL9_3_WARP(), false ), // Switching from hardware to software shouldn't work for FL9 either
PlatformsWithLinkResult(ES2_D3D11(), ES2_D3D9(), false ), // Switching from D3D11 to D3D9 shouldn't work PlatformsWithLinkResult(ES2_D3D11(), ES2_D3D9(), false ), // Switching from D3D11 to D3D9 shouldn't work
PlatformsWithLinkResult(ES2_D3D9(), ES2_D3D11(), false ), // Switching from D3D9 to D3D11 shouldn't work PlatformsWithLinkResult(ES2_D3D9(), ES2_D3D11(), false ), // Switching from D3D9 to D3D11 shouldn't work
PlatformsWithLinkResult(ES2_D3D11(), ES3_D3D11(), true ) // Switching to newer client version should work PlatformsWithLinkResult(ES2_D3D11(), ES3_D3D11(), false ), // Switching to newer client version shouldn't work
// TODO: ANGLE issue 523
// Compiling a program with client version 3, saving the binary, then loading it with client version 2 should not work
// PlatformsWithLinkResult(ES3_D3D11(), ES2_D3D11(), false )
); );
// clang-format on
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment