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

Unified Diff: gpu/command_buffer/service/gles2_cmd_decoder.cc

Issue 2443123004: Revert of gpu: Clarify sized texture format is available only if ES3 context or immutable (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 2 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
Index: gpu/command_buffer/service/gles2_cmd_decoder.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
index 3b0ff7b719a9502254a3f7ed6d3d58f800ef0d9f..33e87e3c0609664cb861140a0021decda2c1098a 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -16407,18 +16407,22 @@
GLsizei level_width = width;
GLsizei level_height = height;
GLsizei level_depth = depth;
+ GLenum adjusted_format =
+ feature_info_->IsES3Enabled() ? internal_format : format;
for (int ii = 0; ii < levels; ++ii) {
if (target == GL_TEXTURE_CUBE_MAP) {
for (int jj = 0; jj < 6; ++jj) {
GLenum face = GL_TEXTURE_CUBE_MAP_POSITIVE_X + jj;
- texture_manager()->SetLevelInfo(
- texture_ref, face, ii, internal_format, level_width, level_height,
- 1, 0, format, type, gfx::Rect());
+ texture_manager()->SetLevelInfo(texture_ref, face, ii,
+ adjusted_format,
+ level_width, level_height, 1,
+ 0, format, type, gfx::Rect());
}
} else {
- texture_manager()->SetLevelInfo(
- texture_ref, target, ii, internal_format, level_width, level_height,
- level_depth, 0, format, type, gfx::Rect());
+ texture_manager()->SetLevelInfo(texture_ref, target, ii,
+ adjusted_format,
+ level_width, level_height, level_depth,
+ 0, format, type, gfx::Rect());
}
level_width = std::max(1, level_width >> 1);
level_height = std::max(1, level_height >> 1);
« no previous file with comments | « gpu/command_buffer/service/framebuffer_manager_unittest.cc ('k') | gpu/command_buffer/service/texture_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698