зеркало из https://github.com/mozilla/gecko-dev.git
Backed out changeset 020581c23b7d (bug 1367613) for gl error during test_conformance__extensions__webgl-debug-shaders.html. r=backout on a CLOSED TREE
This commit is contained in:
Sebastian Hengst
Родитель
4a3997ebd2
Коммит
22d024f800
|
|
@ -931,8 +931,6 @@ WebGLContext::SetDimensions(int32_t signedWidth, int32_t signedHeight)
|
|||
mResetLayer = true;
|
||||
mBackbufferNeedsClear = true;
|
||||
|
||||
gl->ResetSyncCallCount("Existing WebGLContext resized.");
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
|
@ -1147,8 +1145,6 @@ WebGLContext::SetDimensions(int32_t signedWidth, int32_t signedHeight)
|
|||
reporter.SetSuccessful();
|
||||
|
||||
failureId = NS_LITERAL_CSTRING("SUCCESS");
|
||||
|
||||
gl->ResetSyncCallCount("WebGLContext Initialization");
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
|
@ -1601,7 +1597,6 @@ WebGLContext::OnEndOfFrame() const
|
|||
mDataAllocGLCallCount);
|
||||
}
|
||||
mDataAllocGLCallCount = 0;
|
||||
gl->ResetSyncCallCount("WebGLContext PresentScreenBuffer");
|
||||
}
|
||||
|
||||
// For an overview of how WebGL compositing works, see:
|
||||
|
|
|
|||
|
|
@ -290,7 +290,6 @@ GLContext::GLContext(CreateContextFlags flags, const SurfaceCaps& caps,
|
|||
mTextureAllocCrashesOnMapFailure(false),
|
||||
mNeedsCheckAfterAttachTextureToFb(false),
|
||||
mWorkAroundDriverBugs(true),
|
||||
mSyncGLCallCount(0),
|
||||
mHeavyGLCallsSinceLastFlush(false)
|
||||
{
|
||||
mMaxViewportDims[0] = 0;
|
||||
|
|
@ -3047,16 +3046,6 @@ bool GLContext::MakeCurrent(bool aForce)
|
|||
return true;
|
||||
}
|
||||
|
||||
void
|
||||
GLContext::ResetSyncCallCount(const char* resetReason) const
|
||||
{
|
||||
if (ShouldSpew()) {
|
||||
printf_stderr("On %s, mSyncGLCallCount = %" PRIu64 "\n",
|
||||
resetReason, mSyncGLCallCount);
|
||||
}
|
||||
|
||||
mSyncGLCallCount = 0;
|
||||
}
|
||||
|
||||
} /* namespace gl */
|
||||
} /* namespace mozilla */
|
||||
|
|
|
|||
|
|
@ -788,16 +788,6 @@ private:
|
|||
// if it's bound.
|
||||
void AfterGLReadCall() { }
|
||||
|
||||
public:
|
||||
void OnSyncCall() const {
|
||||
mSyncGLCallCount++;
|
||||
}
|
||||
|
||||
uint64_t GetSyncCallCount() const {
|
||||
return mSyncGLCallCount;
|
||||
}
|
||||
|
||||
void ResetSyncCallCount(const char* resetReason) const;
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
// GL official entry points
|
||||
|
|
@ -895,7 +885,6 @@ private:
|
|||
ASSERT_NOT_PASSING_STACK_BUFFER_TO_GL(data);
|
||||
BEFORE_GL_CALL;
|
||||
mSymbols.fBufferData(target, size, data, usage);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
mHeavyGLCallsSinceLastFlush = true;
|
||||
}
|
||||
|
|
@ -1142,7 +1131,6 @@ public:
|
|||
void fFinish() {
|
||||
BEFORE_GL_CALL;
|
||||
mSymbols.fFinish();
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
mHeavyGLCallsSinceLastFlush = false;
|
||||
}
|
||||
|
|
@ -1163,28 +1151,24 @@ public:
|
|||
void fGetActiveAttrib(GLuint program, GLuint index, GLsizei maxLength, GLsizei* length, GLint* size, GLenum* type, GLchar* name) {
|
||||
BEFORE_GL_CALL;
|
||||
mSymbols.fGetActiveAttrib(program, index, maxLength, length, size, type, name);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
}
|
||||
|
||||
void fGetActiveUniform(GLuint program, GLuint index, GLsizei maxLength, GLsizei* length, GLint* size, GLenum* type, GLchar* name) {
|
||||
BEFORE_GL_CALL;
|
||||
mSymbols.fGetActiveUniform(program, index, maxLength, length, size, type, name);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
}
|
||||
|
||||
void fGetAttachedShaders(GLuint program, GLsizei maxCount, GLsizei* count, GLuint* shaders) {
|
||||
BEFORE_GL_CALL;
|
||||
mSymbols.fGetAttachedShaders(program, maxCount, count, shaders);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
}
|
||||
|
||||
GLint fGetAttribLocation(GLuint program, const GLchar* name) {
|
||||
BEFORE_GL_CALL;
|
||||
GLint retval = mSymbols.fGetAttribLocation(program, name);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
return retval;
|
||||
}
|
||||
|
|
@ -1193,7 +1177,6 @@ private:
|
|||
void raw_fGetIntegerv(GLenum pname, GLint* params) {
|
||||
BEFORE_GL_CALL;
|
||||
mSymbols.fGetIntegerv(pname, params);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
}
|
||||
|
||||
|
|
@ -1216,21 +1199,18 @@ public:
|
|||
void fGetFloatv(GLenum pname, GLfloat* params) {
|
||||
BEFORE_GL_CALL;
|
||||
mSymbols.fGetFloatv(pname, params);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
}
|
||||
|
||||
void fGetBooleanv(GLenum pname, realGLboolean* params) {
|
||||
BEFORE_GL_CALL;
|
||||
mSymbols.fGetBooleanv(pname, params);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
}
|
||||
|
||||
void fGetBufferParameteriv(GLenum target, GLenum pname, GLint* params) {
|
||||
BEFORE_GL_CALL;
|
||||
mSymbols.fGetBufferParameteriv(target, pname, params);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
}
|
||||
|
||||
|
|
@ -1238,7 +1218,6 @@ public:
|
|||
BEFORE_GL_CALL;
|
||||
ASSERT_SYMBOL_PRESENT(fGetDebugMessageLog);
|
||||
GLuint ret = mSymbols.fGetDebugMessageLog(count, bufsize, sources, types, ids, severities, lengths, messageLog);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -1247,7 +1226,6 @@ public:
|
|||
BEFORE_GL_CALL;
|
||||
ASSERT_SYMBOL_PRESENT(fGetPointerv);
|
||||
mSymbols.fGetPointerv(pname, params);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
}
|
||||
|
||||
|
|
@ -1255,7 +1233,6 @@ public:
|
|||
BEFORE_GL_CALL;
|
||||
ASSERT_SYMBOL_PRESENT(fGetObjectLabel);
|
||||
mSymbols.fGetObjectLabel(identifier, name, bufSize, length, label);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
}
|
||||
|
||||
|
|
@ -1263,7 +1240,6 @@ public:
|
|||
BEFORE_GL_CALL;
|
||||
ASSERT_SYMBOL_PRESENT(fGetObjectPtrLabel);
|
||||
mSymbols.fGetObjectPtrLabel(ptr, bufSize, length, label);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
}
|
||||
|
||||
|
|
@ -1276,14 +1252,12 @@ public:
|
|||
void fGetProgramiv(GLuint program, GLenum pname, GLint* param) {
|
||||
BEFORE_GL_CALL;
|
||||
mSymbols.fGetProgramiv(program, pname, param);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
}
|
||||
|
||||
void fGetProgramInfoLog(GLuint program, GLsizei bufSize, GLsizei* length, GLchar* infoLog) {
|
||||
BEFORE_GL_CALL;
|
||||
mSymbols.fGetProgramInfoLog(program, bufSize, length, infoLog);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
}
|
||||
|
||||
|
|
@ -1308,7 +1282,6 @@ public:
|
|||
const GLubyte* fGetString(GLenum name) {
|
||||
BEFORE_GL_CALL;
|
||||
const GLubyte* result = mSymbols.fGetString(name);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
return result;
|
||||
}
|
||||
|
|
@ -1317,7 +1290,6 @@ public:
|
|||
BEFORE_GL_CALL;
|
||||
ASSERT_SYMBOL_PRESENT(fGetTexImage);
|
||||
mSymbols.fGetTexImage(target, level, format, type, img);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
}
|
||||
|
||||
|
|
@ -1326,35 +1298,30 @@ public:
|
|||
BEFORE_GL_CALL;
|
||||
ASSERT_SYMBOL_PRESENT(fGetTexLevelParameteriv);
|
||||
mSymbols.fGetTexLevelParameteriv(target, level, pname, params);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
}
|
||||
|
||||
void fGetTexParameterfv(GLenum target, GLenum pname, GLfloat* params) {
|
||||
BEFORE_GL_CALL;
|
||||
mSymbols.fGetTexParameterfv(target, pname, params);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
}
|
||||
|
||||
void fGetTexParameteriv(GLenum target, GLenum pname, GLint* params) {
|
||||
BEFORE_GL_CALL;
|
||||
mSymbols.fGetTexParameteriv(target, pname, params);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
}
|
||||
|
||||
void fGetUniformfv(GLuint program, GLint location, GLfloat* params) {
|
||||
BEFORE_GL_CALL;
|
||||
mSymbols.fGetUniformfv(program, location, params);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
}
|
||||
|
||||
void fGetUniformiv(GLuint program, GLint location, GLint* params) {
|
||||
BEFORE_GL_CALL;
|
||||
mSymbols.fGetUniformiv(program, location, params);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
}
|
||||
|
||||
|
|
@ -1362,14 +1329,12 @@ public:
|
|||
BEFORE_GL_CALL;
|
||||
ASSERT_SYMBOL_PRESENT(fGetUniformuiv);
|
||||
mSymbols.fGetUniformuiv(program, location, params);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
}
|
||||
|
||||
GLint fGetUniformLocation (GLint programObj, const GLchar* name) {
|
||||
BEFORE_GL_CALL;
|
||||
GLint retval = mSymbols.fGetUniformLocation(programObj, name);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
return retval;
|
||||
}
|
||||
|
|
@ -1377,21 +1342,18 @@ public:
|
|||
void fGetVertexAttribfv(GLuint index, GLenum pname, GLfloat* retval) {
|
||||
BEFORE_GL_CALL;
|
||||
mSymbols.fGetVertexAttribfv(index, pname, retval);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
}
|
||||
|
||||
void fGetVertexAttribiv(GLuint index, GLenum pname, GLint* retval) {
|
||||
BEFORE_GL_CALL;
|
||||
mSymbols.fGetVertexAttribiv(index, pname, retval);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
}
|
||||
|
||||
void fGetVertexAttribPointerv(GLuint index, GLenum pname, GLvoid** retval) {
|
||||
BEFORE_GL_CALL;
|
||||
mSymbols.fGetVertexAttribPointerv(index, pname, retval);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
}
|
||||
|
||||
|
|
@ -1404,7 +1366,6 @@ public:
|
|||
realGLboolean fIsBuffer(GLuint buffer) {
|
||||
BEFORE_GL_CALL;
|
||||
realGLboolean retval = mSymbols.fIsBuffer(buffer);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
return retval;
|
||||
}
|
||||
|
|
@ -1536,7 +1497,6 @@ public:
|
|||
ASSERT_NOT_PASSING_STACK_BUFFER_TO_GL(pixels);
|
||||
BEFORE_GL_CALL;
|
||||
mSymbols.fReadPixels(x, y, width, height, format, type, pixels);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
mHeavyGLCallsSinceLastFlush = true;
|
||||
}
|
||||
|
|
@ -1900,14 +1860,12 @@ public:
|
|||
void fGetShaderiv(GLuint shader, GLenum pname, GLint* param) {
|
||||
BEFORE_GL_CALL;
|
||||
mSymbols.fGetShaderiv(shader, pname, param);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
}
|
||||
|
||||
void fGetShaderInfoLog(GLuint shader, GLsizei bufSize, GLsizei* length, GLchar* infoLog) {
|
||||
BEFORE_GL_CALL;
|
||||
mSymbols.fGetShaderInfoLog(shader, bufSize, length, infoLog);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
}
|
||||
|
||||
|
|
@ -1918,7 +1876,6 @@ private:
|
|||
BEFORE_GL_CALL;
|
||||
ASSERT_SYMBOL_PRESENT(fGetShaderPrecisionFormat);
|
||||
mSymbols.fGetShaderPrecisionFormat(shadertype, precisiontype, range, precision);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
}
|
||||
|
||||
|
|
@ -1935,7 +1892,6 @@ public:
|
|||
void fGetShaderSource(GLint obj, GLsizei maxLength, GLsizei* length, GLchar* source) {
|
||||
BEFORE_GL_CALL;
|
||||
mSymbols.fGetShaderSource(obj, maxLength, length, source);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
}
|
||||
|
||||
|
|
@ -1964,7 +1920,6 @@ public:
|
|||
GLenum fCheckFramebufferStatus(GLenum target) {
|
||||
BEFORE_GL_CALL;
|
||||
GLenum retval = mSymbols.fCheckFramebufferStatus(target);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
return retval;
|
||||
}
|
||||
|
|
@ -1994,21 +1949,18 @@ public:
|
|||
void fGetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment, GLenum pname, GLint* value) {
|
||||
BEFORE_GL_CALL;
|
||||
mSymbols.fGetFramebufferAttachmentParameteriv(target, attachment, pname, value);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
}
|
||||
|
||||
void fGetRenderbufferParameteriv(GLenum target, GLenum pname, GLint* value) {
|
||||
BEFORE_GL_CALL;
|
||||
mSymbols.fGetRenderbufferParameteriv(target, pname, value);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
}
|
||||
|
||||
realGLboolean fIsFramebuffer (GLuint framebuffer) {
|
||||
BEFORE_GL_CALL;
|
||||
realGLboolean retval = mSymbols.fIsFramebuffer(framebuffer);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
return retval;
|
||||
}
|
||||
|
|
@ -2017,7 +1969,6 @@ public:
|
|||
realGLboolean fIsRenderbuffer (GLuint renderbuffer) {
|
||||
BEFORE_GL_CALL;
|
||||
realGLboolean retval = mSymbols.fIsRenderbuffer(renderbuffer);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
return retval;
|
||||
}
|
||||
|
|
@ -2086,7 +2037,6 @@ public:
|
|||
BEFORE_GL_CALL;
|
||||
ASSERT_SYMBOL_PRESENT(fMapBuffer);
|
||||
void* ret = mSymbols.fMapBuffer(target, access);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -2118,28 +2068,24 @@ private:
|
|||
void raw_fGenBuffers(GLsizei n, GLuint* names) {
|
||||
BEFORE_GL_CALL;
|
||||
mSymbols.fGenBuffers(n, names);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
}
|
||||
|
||||
void raw_fGenFramebuffers(GLsizei n, GLuint* names) {
|
||||
BEFORE_GL_CALL;
|
||||
mSymbols.fGenFramebuffers(n, names);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
}
|
||||
|
||||
void raw_fGenRenderbuffers(GLsizei n, GLuint* names) {
|
||||
BEFORE_GL_CALL;
|
||||
mSymbols.fGenRenderbuffers(n, names);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
}
|
||||
|
||||
void raw_fGenTextures(GLsizei n, GLuint* names) {
|
||||
BEFORE_GL_CALL;
|
||||
mSymbols.fGenTextures(n, names);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
}
|
||||
|
||||
|
|
@ -2246,7 +2192,6 @@ public:
|
|||
BEFORE_GL_CALL;
|
||||
ASSERT_SYMBOL_PRESENT(fGetGraphicsResetStatus);
|
||||
GLenum ret = mSymbols.fGetGraphicsResetStatus();
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -2259,7 +2204,6 @@ public:
|
|||
BEFORE_GL_CALL;
|
||||
ASSERT_SYMBOL_PRESENT(fFenceSync);
|
||||
GLsync ret = mSymbols.fFenceSync(condition, flags);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -2268,7 +2212,6 @@ public:
|
|||
BEFORE_GL_CALL;
|
||||
ASSERT_SYMBOL_PRESENT(fIsSync);
|
||||
realGLboolean ret = mSymbols.fIsSync(sync);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -2284,7 +2227,6 @@ public:
|
|||
BEFORE_GL_CALL;
|
||||
ASSERT_SYMBOL_PRESENT(fClientWaitSync);
|
||||
GLenum ret = mSymbols.fClientWaitSync(sync, flags, timeout);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -2307,7 +2249,6 @@ public:
|
|||
BEFORE_GL_CALL;
|
||||
ASSERT_SYMBOL_PRESENT(fGetSynciv);
|
||||
mSymbols.fGetSynciv(sync, pname, bufSize, length, values);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
}
|
||||
|
||||
|
|
@ -2450,7 +2391,6 @@ public:
|
|||
ASSERT_SYMBOL_PRESENT(fGetVertexAttribIiv);
|
||||
BEFORE_GL_CALL;
|
||||
mSymbols.fGetVertexAttribIiv(index, pname, params);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
}
|
||||
|
||||
|
|
@ -2459,7 +2399,6 @@ public:
|
|||
ASSERT_SYMBOL_PRESENT(fGetVertexAttribIuiv);
|
||||
BEFORE_GL_CALL;
|
||||
mSymbols.fGetVertexAttribIuiv(index, pname, params);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
}
|
||||
|
||||
|
|
@ -2564,7 +2503,6 @@ public:
|
|||
BEFORE_GL_CALL;
|
||||
ASSERT_SYMBOL_PRESENT(fGetFragDataLocation);
|
||||
GLint result = mSymbols.fGetFragDataLocation(program, name);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
return result;
|
||||
}
|
||||
|
|
@ -2588,7 +2526,6 @@ public:
|
|||
BEFORE_GL_CALL;
|
||||
ASSERT_SYMBOL_PRESENT(fGetInternalformativ);
|
||||
mSymbols.fGetInternalformativ(target, internalformat, pname, bufSize, params);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
}
|
||||
|
||||
|
|
@ -2645,7 +2582,6 @@ public:
|
|||
BEFORE_GL_CALL;
|
||||
ASSERT_SYMBOL_PRESENT(fGetQueryiv);
|
||||
mSymbols.fGetQueryiv(target, pname, params);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
}
|
||||
|
||||
|
|
@ -2653,7 +2589,6 @@ public:
|
|||
BEFORE_GL_CALL;
|
||||
ASSERT_SYMBOL_PRESENT(fGetQueryObjectuiv);
|
||||
mSymbols.fGetQueryObjectuiv(id, pname, params);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
}
|
||||
|
||||
|
|
@ -2661,7 +2596,6 @@ public:
|
|||
BEFORE_GL_CALL;
|
||||
ASSERT_SYMBOL_PRESENT(fIsQuery);
|
||||
realGLboolean retval = mSymbols.fIsQuery(query);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
return retval;
|
||||
}
|
||||
|
|
@ -2678,7 +2612,6 @@ public:
|
|||
BEFORE_GL_CALL;
|
||||
ASSERT_SYMBOL_PRESENT(fGetQueryObjecti64v);
|
||||
mSymbols.fGetQueryObjecti64v(id, pname, params);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
}
|
||||
|
||||
|
|
@ -2686,7 +2619,6 @@ public:
|
|||
BEFORE_GL_CALL;
|
||||
ASSERT_SYMBOL_PRESENT(fGetQueryObjectui64v);
|
||||
mSymbols.fGetQueryObjectui64v(id, pname, params);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
}
|
||||
|
||||
|
|
@ -2707,7 +2639,6 @@ public:
|
|||
BEFORE_GL_CALL;
|
||||
ASSERT_SYMBOL_PRESENT(fGetQueryObjectiv);
|
||||
mSymbols.fGetQueryObjectiv(id, pname, params);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
}
|
||||
|
||||
|
|
@ -2736,7 +2667,6 @@ public:
|
|||
BEFORE_GL_CALL;
|
||||
ASSERT_SYMBOL_PRESENT(fGenTransformFeedbacks);
|
||||
mSymbols.fGenTransformFeedbacks(n, ids);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
}
|
||||
|
||||
|
|
@ -2753,7 +2683,6 @@ public:
|
|||
BEFORE_GL_CALL;
|
||||
ASSERT_SYMBOL_PRESENT(fIsTransformFeedback);
|
||||
realGLboolean result = mSymbols.fIsTransformFeedback(id);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
return result;
|
||||
}
|
||||
|
|
@ -2795,7 +2724,6 @@ public:
|
|||
BEFORE_GL_CALL;
|
||||
ASSERT_SYMBOL_PRESENT(fGetTransformFeedbackVarying);
|
||||
mSymbols.fGetTransformFeedbackVarying(program, index, bufSize, length, size, type, name);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
}
|
||||
|
||||
|
|
@ -2820,7 +2748,6 @@ public:
|
|||
BEFORE_GL_CALL;
|
||||
ASSERT_SYMBOL_PRESENT(fGetIntegeri_v);
|
||||
mSymbols.fGetIntegeri_v(param, index, values);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
}
|
||||
|
||||
|
|
@ -2828,7 +2755,6 @@ public:
|
|||
ASSERT_SYMBOL_PRESENT(fGetInteger64i_v);
|
||||
BEFORE_GL_CALL;
|
||||
mSymbols.fGetInteger64i_v(target, index, data);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
}
|
||||
|
||||
|
|
@ -2864,7 +2790,6 @@ public:
|
|||
BEFORE_GL_CALL;
|
||||
ASSERT_SYMBOL_PRESENT(fIsVertexArray);
|
||||
realGLboolean ret = mSymbols.fIsVertexArray(array);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -2901,7 +2826,6 @@ public:
|
|||
ASSERT_SYMBOL_PRESENT(fTestFence);
|
||||
BEFORE_GL_CALL;
|
||||
realGLboolean ret = mSymbols.fTestFence(fence);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -2911,7 +2835,6 @@ public:
|
|||
ASSERT_SYMBOL_PRESENT(fFinishFence);
|
||||
BEFORE_GL_CALL;
|
||||
mSymbols.fFinishFence(fence);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
}
|
||||
|
||||
|
|
@ -2920,7 +2843,6 @@ public:
|
|||
ASSERT_SYMBOL_PRESENT(fIsFence);
|
||||
BEFORE_GL_CALL;
|
||||
realGLboolean ret = mSymbols.fIsFence(fence);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -2930,7 +2852,6 @@ public:
|
|||
ASSERT_SYMBOL_PRESENT(fGetFenceiv);
|
||||
BEFORE_GL_CALL;
|
||||
mSymbols.fGetFenceiv(fence, pname, params);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
}
|
||||
|
||||
|
|
@ -2967,7 +2888,6 @@ public:
|
|||
ASSERT_SYMBOL_PRESENT(fMapBufferRange);
|
||||
BEFORE_GL_CALL;
|
||||
void* data = mSymbols.fMapBufferRange(target, offset, length, access);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
return data;
|
||||
}
|
||||
|
|
@ -3004,7 +2924,6 @@ public:
|
|||
BEFORE_GL_CALL;
|
||||
ASSERT_SYMBOL_PRESENT(fIsSampler);
|
||||
realGLboolean result = mSymbols.fIsSampler(sampler);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
return result;
|
||||
}
|
||||
|
|
@ -3075,7 +2994,6 @@ public:
|
|||
ASSERT_SYMBOL_PRESENT(fGetUniformIndices);
|
||||
BEFORE_GL_CALL;
|
||||
mSymbols.fGetUniformIndices(program, uniformCount, uniformNames, uniformIndices);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
}
|
||||
|
||||
|
|
@ -3085,7 +3003,6 @@ public:
|
|||
ASSERT_SYMBOL_PRESENT(fGetActiveUniformsiv);
|
||||
BEFORE_GL_CALL;
|
||||
mSymbols.fGetActiveUniformsiv(program, uniformCount, uniformIndices, pname, params);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
}
|
||||
|
||||
|
|
@ -3093,7 +3010,6 @@ public:
|
|||
ASSERT_SYMBOL_PRESENT(fGetUniformBlockIndex);
|
||||
BEFORE_GL_CALL;
|
||||
GLuint result = mSymbols.fGetUniformBlockIndex(program, uniformBlockName);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
return result;
|
||||
}
|
||||
|
|
@ -3104,7 +3020,6 @@ public:
|
|||
ASSERT_SYMBOL_PRESENT(fGetActiveUniformBlockiv);
|
||||
BEFORE_GL_CALL;
|
||||
mSymbols.fGetActiveUniformBlockiv(program, uniformBlockIndex, pname, params);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
}
|
||||
|
||||
|
|
@ -3114,7 +3029,6 @@ public:
|
|||
ASSERT_SYMBOL_PRESENT(fGetActiveUniformBlockName);
|
||||
BEFORE_GL_CALL;
|
||||
mSymbols.fGetActiveUniformBlockName(program, uniformBlockIndex, bufSize, length, uniformBlockName);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
}
|
||||
|
||||
|
|
@ -3132,7 +3046,6 @@ public:
|
|||
BEFORE_GL_CALL;
|
||||
ASSERT_SYMBOL_PRESENT(fTexStorage2D);
|
||||
mSymbols.fTexStorage2D(target, levels, internalformat, width, height);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
}
|
||||
|
||||
|
|
@ -3141,7 +3054,6 @@ public:
|
|||
BEFORE_GL_CALL;
|
||||
ASSERT_SYMBOL_PRESENT(fTexStorage3D);
|
||||
mSymbols.fTexStorage3D(target, levels, internalformat, width, height, depth);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
}
|
||||
|
||||
|
|
@ -3159,7 +3071,6 @@ public:
|
|||
width, height, depth,
|
||||
border, format, type,
|
||||
data);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
}
|
||||
|
||||
|
|
@ -3172,7 +3083,6 @@ public:
|
|||
mSymbols.fTexSubImage3D(target, level, xoffset, yoffset, zoffset,
|
||||
width, height, depth, format, type,
|
||||
pixels);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
}
|
||||
|
||||
|
|
@ -3222,7 +3132,6 @@ public:
|
|||
BEFORE_GL_CALL;
|
||||
ASSERT_SYMBOL_PRESENT(fGetStringi);
|
||||
const GLubyte* ret = mSymbols.fGetStringi(name, index);
|
||||
OnSyncCall();
|
||||
AFTER_GL_CALL;
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -3566,7 +3475,6 @@ protected:
|
|||
bool mTextureAllocCrashesOnMapFailure;
|
||||
bool mNeedsCheckAfterAttachTextureToFb;
|
||||
bool mWorkAroundDriverBugs;
|
||||
mutable uint64_t mSyncGLCallCount;
|
||||
|
||||
bool IsTextureSizeSafeToPassToDriver(GLenum target, GLsizei width, GLsizei height) const {
|
||||
if (mNeedsTextureSizeChecks) {
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче