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

Unified Diff: ui/gl/gl_bindings_autogen_gl.cc

Issue 2801783002: Revert of Update robust read pixels to output number of columns and rows written. (Closed)
Patch Set: Created 3 years, 8 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 7e7b73b2ff5e1a524926bbda6e45b564c58ae70a..8740c1d16f94586edcbbf6b992098893e686a8e8 100644
--- a/ui/gl/gl_bindings_autogen_gl.cc
+++ b/ui/gl/gl_bindings_autogen_gl.cc
@@ -4247,11 +4247,9 @@
GLenum type,
GLsizei bufSize,
GLsizei* length,
- GLsizei* columns,
- GLsizei* rows,
void* data) {
driver_->fn.glReadnPixelsRobustANGLEFn(x, y, width, height, format, type,
- bufSize, length, columns, rows, data);
+ bufSize, length, data);
}
void GLApiBase::glReadPixelsFn(GLint x,
@@ -4272,11 +4270,9 @@
GLenum type,
GLsizei bufSize,
GLsizei* length,
- GLsizei* columns,
- GLsizei* rows,
void* pixels) {
driver_->fn.glReadPixelsRobustANGLEFn(x, y, width, height, format, type,
- bufSize, length, columns, rows, pixels);
+ bufSize, length, pixels);
}
void GLApiBase::glReleaseShaderCompilerFn(void) {
@@ -7150,12 +7146,10 @@
GLenum type,
GLsizei bufSize,
GLsizei* length,
- GLsizei* columns,
- GLsizei* rows,
void* data) {
TRACE_EVENT_BINARY_EFFICIENT0("gpu", "TraceGLAPI::glReadnPixelsRobustANGLE")
gl_api_->glReadnPixelsRobustANGLEFn(x, y, width, height, format, type,
- bufSize, length, columns, rows, data);
+ bufSize, length, data);
}
void TraceGLApi::glReadPixelsFn(GLint x,
@@ -7177,12 +7171,10 @@
GLenum type,
GLsizei bufSize,
GLsizei* length,
- GLsizei* columns,
- GLsizei* rows,
void* pixels) {
TRACE_EVENT_BINARY_EFFICIENT0("gpu", "TraceGLAPI::glReadPixelsRobustANGLE")
gl_api_->glReadPixelsRobustANGLEFn(x, y, width, height, format, type, bufSize,
- length, columns, rows, pixels);
+ length, pixels);
}
void TraceGLApi::glReleaseShaderCompilerFn(void) {
@@ -10867,19 +10859,15 @@
GLenum type,
GLsizei bufSize,
GLsizei* length,
- GLsizei* columns,
- GLsizei* rows,
void* data) {
GL_SERVICE_LOG("glReadnPixelsRobustANGLE"
<< "(" << x << ", " << y << ", " << width << ", " << height
<< ", " << GLEnums::GetStringEnum(format) << ", "
<< GLEnums::GetStringEnum(type) << ", " << bufSize << ", "
<< static_cast<const void*>(length) << ", "
- << static_cast<const void*>(columns) << ", "
- << static_cast<const void*>(rows) << ", "
<< static_cast<const void*>(data) << ")");
gl_api_->glReadnPixelsRobustANGLEFn(x, y, width, height, format, type,
- bufSize, length, columns, rows, data);
+ bufSize, length, data);
}
void DebugGLApi::glReadPixelsFn(GLint x,
@@ -10905,19 +10893,15 @@
GLenum type,
GLsizei bufSize,
GLsizei* length,
- GLsizei* columns,
- GLsizei* rows,
void* pixels) {
GL_SERVICE_LOG("glReadPixelsRobustANGLE"
<< "(" << x << ", " << y << ", " << width << ", " << height
<< ", " << GLEnums::GetStringEnum(format) << ", "
<< GLEnums::GetStringEnum(type) << ", " << bufSize << ", "
<< static_cast<const void*>(length) << ", "
- << static_cast<const void*>(columns) << ", "
- << static_cast<const void*>(rows) << ", "
<< static_cast<const void*>(pixels) << ")");
gl_api_->glReadPixelsRobustANGLEFn(x, y, width, height, format, type, bufSize,
- length, columns, rows, pixels);
+ length, pixels);
}
void DebugGLApi::glReleaseShaderCompilerFn(void) {
@@ -14490,8 +14474,6 @@
GLenum type,
GLsizei bufSize,
GLsizei* length,
- GLsizei* columns,
- GLsizei* rows,
void* data) {
NOTREACHED()
<< "Trying to call glReadnPixelsRobustANGLE() without current GL context";
@@ -14518,8 +14500,6 @@
GLenum type,
GLsizei bufSize,
GLsizei* length,
- GLsizei* columns,
- GLsizei* rows,
void* pixels) {
NOTREACHED()
<< "Trying to call glReadPixelsRobustANGLE() without current GL context";
« 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