Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(347)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/gl/gl_bindings_autogen_gl.cc

Issue 2781863002: Revert of Update the passthrough command decoder to use the new CHROMIUM_copy_texture. (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gl/gl_bindings_autogen_gl.h ('k') | ui/gl/gl_bindings_autogen_mock.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_bindings_autogen_gl.cc
diff --git a/ui/gl/gl_bindings_autogen_gl.cc b/ui/gl/gl_bindings_autogen_gl.cc
index 8740c1d16f94586edcbbf6b992098893e686a8e8..09886f3c166ca22a72bae8fa61a7345efceba194 100644
--- a/ui/gl/gl_bindings_autogen_gl.cc
+++ b/ui/gl/gl_bindings_autogen_gl.cc
@@ -2780,10 +2780,7 @@
}
void GLApiBase::glCopySubTextureCHROMIUMFn(GLuint sourceId,
- GLint sourceLevel,
- GLenum destTarget,
GLuint destId,
- GLint destLevel,
GLint xoffset,
GLint yoffset,
GLint x,
@@ -2794,9 +2791,8 @@
GLboolean unpackPremultiplyAlpha,
GLboolean unpackUnmultiplyAlpha) {
driver_->fn.glCopySubTextureCHROMIUMFn(
- sourceId, sourceLevel, destTarget, destId, destLevel, xoffset, yoffset, x,
- y, width, height, unpackFlipY, unpackPremultiplyAlpha,
- unpackUnmultiplyAlpha);
+ sourceId, destId, xoffset, yoffset, x, y, width, height, unpackFlipY,
+ unpackPremultiplyAlpha, unpackUnmultiplyAlpha);
}
void GLApiBase::glCopyTexImage2DFn(GLenum target,
@@ -2837,18 +2833,15 @@
}
void GLApiBase::glCopyTextureCHROMIUMFn(GLuint sourceId,
- GLint sourceLevel,
- GLenum destTarget,
GLuint destId,
- GLint destLevel,
GLint internalFormat,
GLenum destType,
GLboolean unpackFlipY,
GLboolean unpackPremultiplyAlpha,
GLboolean unpackUnmultiplyAlpha) {
driver_->fn.glCopyTextureCHROMIUMFn(
- sourceId, sourceLevel, destTarget, destId, destLevel, internalFormat,
- destType, unpackFlipY, unpackPremultiplyAlpha, unpackUnmultiplyAlpha);
+ sourceId, destId, internalFormat, destType, unpackFlipY,
+ unpackPremultiplyAlpha, unpackUnmultiplyAlpha);
}
void GLApiBase::glCoverageModulationNVFn(GLenum components) {
@@ -5410,10 +5403,7 @@
}
void TraceGLApi::glCopySubTextureCHROMIUMFn(GLuint sourceId,
- GLint sourceLevel,
- GLenum destTarget,
GLuint destId,
- GLint destLevel,
GLint xoffset,
GLint yoffset,
GLint x,
@@ -5425,9 +5415,8 @@
GLboolean unpackUnmultiplyAlpha) {
TRACE_EVENT_BINARY_EFFICIENT0("gpu", "TraceGLAPI::glCopySubTextureCHROMIUM")
gl_api_->glCopySubTextureCHROMIUMFn(
- sourceId, sourceLevel, destTarget, destId, destLevel, xoffset, yoffset, x,
- y, width, height, unpackFlipY, unpackPremultiplyAlpha,
- unpackUnmultiplyAlpha);
+ sourceId, destId, xoffset, yoffset, x, y, width, height, unpackFlipY,
+ unpackPremultiplyAlpha, unpackUnmultiplyAlpha);
}
void TraceGLApi::glCopyTexImage2DFn(GLenum target,
@@ -5471,19 +5460,16 @@
}
void TraceGLApi::glCopyTextureCHROMIUMFn(GLuint sourceId,
- GLint sourceLevel,
- GLenum destTarget,
GLuint destId,
- GLint destLevel,
GLint internalFormat,
GLenum destType,
GLboolean unpackFlipY,
GLboolean unpackPremultiplyAlpha,
GLboolean unpackUnmultiplyAlpha) {
TRACE_EVENT_BINARY_EFFICIENT0("gpu", "TraceGLAPI::glCopyTextureCHROMIUM")
- gl_api_->glCopyTextureCHROMIUMFn(
- sourceId, sourceLevel, destTarget, destId, destLevel, internalFormat,
- destType, unpackFlipY, unpackPremultiplyAlpha, unpackUnmultiplyAlpha);
+ gl_api_->glCopyTextureCHROMIUMFn(sourceId, destId, internalFormat, destType,
+ unpackFlipY, unpackPremultiplyAlpha,
+ unpackUnmultiplyAlpha);
}
void TraceGLApi::glCoverageModulationNVFn(GLenum components) {
@@ -8544,10 +8530,7 @@
}
void DebugGLApi::glCopySubTextureCHROMIUMFn(GLuint sourceId,
- GLint sourceLevel,
- GLenum destTarget,
GLuint destId,
- GLint destLevel,
GLint xoffset,
GLint yoffset,
GLint x,
@@ -8558,17 +8541,15 @@
GLboolean unpackPremultiplyAlpha,
GLboolean unpackUnmultiplyAlpha) {
GL_SERVICE_LOG("glCopySubTextureCHROMIUM"
- << "(" << sourceId << ", " << sourceLevel << ", "
- << GLEnums::GetStringEnum(destTarget) << ", " << destId << ", "
- << destLevel << ", " << xoffset << ", " << yoffset << ", " << x
- << ", " << y << ", " << width << ", " << height << ", "
- << GLEnums::GetStringBool(unpackFlipY) << ", "
- << GLEnums::GetStringBool(unpackPremultiplyAlpha) << ", "
- << GLEnums::GetStringBool(unpackUnmultiplyAlpha) << ")");
+ << "(" << sourceId << ", " << destId << ", " << xoffset << ", "
+ << yoffset << ", " << x << ", " << y << ", " << width << ", "
+ << height << ", " << GLEnums::GetStringBool(unpackFlipY)
+ << ", " << GLEnums::GetStringBool(unpackPremultiplyAlpha)
+ << ", " << GLEnums::GetStringBool(unpackUnmultiplyAlpha)
+ << ")");
gl_api_->glCopySubTextureCHROMIUMFn(
- sourceId, sourceLevel, destTarget, destId, destLevel, xoffset, yoffset, x,
- y, width, height, unpackFlipY, unpackPremultiplyAlpha,
- unpackUnmultiplyAlpha);
+ sourceId, destId, xoffset, yoffset, x, y, width, height, unpackFlipY,
+ unpackPremultiplyAlpha, unpackUnmultiplyAlpha);
}
void DebugGLApi::glCopyTexImage2DFn(GLenum target,
@@ -8623,26 +8604,21 @@
}
void DebugGLApi::glCopyTextureCHROMIUMFn(GLuint sourceId,
- GLint sourceLevel,
- GLenum destTarget,
GLuint destId,
- GLint destLevel,
GLint internalFormat,
GLenum destType,
GLboolean unpackFlipY,
GLboolean unpackPremultiplyAlpha,
GLboolean unpackUnmultiplyAlpha) {
GL_SERVICE_LOG("glCopyTextureCHROMIUM"
- << "(" << sourceId << ", " << sourceLevel << ", "
- << GLEnums::GetStringEnum(destTarget) << ", " << destId << ", "
- << destLevel << ", " << internalFormat << ", "
- << GLEnums::GetStringEnum(destType) << ", "
+ << "(" << sourceId << ", " << destId << ", " << internalFormat
+ << ", " << GLEnums::GetStringEnum(destType) << ", "
<< GLEnums::GetStringBool(unpackFlipY) << ", "
<< GLEnums::GetStringBool(unpackPremultiplyAlpha) << ", "
<< GLEnums::GetStringBool(unpackUnmultiplyAlpha) << ")");
- gl_api_->glCopyTextureCHROMIUMFn(
- sourceId, sourceLevel, destTarget, destId, destLevel, internalFormat,
- destType, unpackFlipY, unpackPremultiplyAlpha, unpackUnmultiplyAlpha);
+ gl_api_->glCopyTextureCHROMIUMFn(sourceId, destId, internalFormat, destType,
+ unpackFlipY, unpackPremultiplyAlpha,
+ unpackUnmultiplyAlpha);
}
void DebugGLApi::glCoverageModulationNVFn(GLenum components) {
@@ -12492,10 +12468,7 @@
void NoContextGLApi::glCopySubTextureCHROMIUMFn(
GLuint sourceId,
- GLint sourceLevel,
- GLenum destTarget,
GLuint destId,
- GLint destLevel,
GLint xoffset,
GLint yoffset,
GLint x,
@@ -12554,10 +12527,7 @@
}
void NoContextGLApi::glCopyTextureCHROMIUMFn(GLuint sourceId,
- GLint sourceLevel,
- GLenum destTarget,
GLuint destId,
- GLint destLevel,
GLint internalFormat,
GLenum destType,
GLboolean unpackFlipY,
« no previous file with comments | « ui/gl/gl_bindings_autogen_gl.h ('k') | ui/gl/gl_bindings_autogen_mock.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698