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

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

Issue 2999923002: Revert of Allow creating GLImage-backed textures with glTexStorage2D. (Closed)
Patch Set: rebase Created 3 years, 4 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 d7163d7ad2f9e362ac187556afc371d0daedd620..580bc5d0e5b34f5245dbf7f315efe03af723a9ac 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -2848,7 +2848,7 @@ bool BackTexture::AllocateNativeGpuMemoryBuffer(const gfx::Size& size,
gfx::BufferFormat::RGBX_8888
#endif
: gfx::BufferFormat::RGBA_8888,
- gfx::BufferUsage::SCANOUT, format);
+ format);
if (!image || !image->BindTexImage(Target()))
return false;
@@ -3879,8 +3879,6 @@ Capabilities GLES2DecoderImpl::GetCapabilities() {
!surface_->IsOffscreen()) {
caps.disable_non_empty_post_sub_buffers = true;
}
- caps.texture_buffer_chromium =
- feature_info_->feature_flags().chromium_texture_buffer;
return caps;
}
@@ -10984,13 +10982,6 @@ void GLES2DecoderImpl::GetTexParameterImpl(
iparams[0] = texture->swizzle_a();
}
return;
- case GL_TEXTURE_BUFFER_USAGE_CHROMIUM:
- if (fparams) {
- fparams[0] = static_cast<GLfloat>(texture->buffer_usage());
- } else {
- iparams[0] = texture->buffer_usage();
- }
- return;
default:
break;
}
@@ -17570,62 +17561,6 @@ void GLES2DecoderImpl::TexStorageImpl(GLenum target,
return;
}
- if (texture->buffer_usage() != GL_NONE) {
- ScopedGLErrorSuppressor suppressor("GLES2CmdDecoder::TexStorageImpl",
- state_.GetErrorState());
- gfx::Size size(width, height);
- gfx::BufferFormat buffer_format;
- GLint real_internal_format;
- switch (internal_format) {
- case GL_RGBA8_OES:
- buffer_format = gfx::BufferFormat::RGBA_8888;
- real_internal_format = GL_RGBA;
- break;
- case GL_BGRA8_EXT:
- buffer_format = gfx::BufferFormat::BGRA_8888;
- real_internal_format = GL_BGRA_EXT;
- break;
- case GL_RGBA16F_EXT:
- buffer_format = gfx::BufferFormat::RGBA_F16;
- real_internal_format = GL_RGBA;
- break;
- default:
- LOCAL_SET_GL_ERROR(GL_INVALID_ENUM, function_name,
- "Invalid buffer format");
- return;
- }
-
- if (levels != 1) {
- LOCAL_SET_GL_ERROR(GL_INVALID_VALUE, function_name,
- "Levels != 1 for buffer");
- return;
- }
- if (depth > 1) {
- LOCAL_SET_GL_ERROR(GL_INVALID_VALUE, function_name,
- "depth > 1 for buffer");
- return;
- }
- DCHECK_EQ(GL_TEXTURE_BUFFER_SCANOUT_CHROMIUM, texture->buffer_usage());
-
- gfx::BufferUsage buffer_usage = gfx::BufferUsage::SCANOUT;
- scoped_refptr<gl::GLImage> image =
- GetContextGroup()->image_factory()->CreateAnonymousImage(
- gfx::Size(width, height), buffer_format, buffer_usage,
- real_internal_format);
- if (!image || !image->BindTexImage(target)) {
- LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION, function_name,
- "Cannot create GL Image");
- return;
- }
-
- texture_manager()->SetLevelInfo(
- texture_ref, target, 0, image->GetInternalFormat(), width, height, 1, 0,
- image->GetInternalFormat(), GL_UNSIGNED_BYTE, gfx::Rect(size));
- texture_manager()->SetLevelImage(texture_ref, target, 0, image.get(),
- Texture::BOUND);
- return;
- }
-
GLenum format = TextureManager::ExtractFormatFromStorageFormat(
internal_format);
GLenum type = TextureManager::ExtractTypeFromStorageFormat(internal_format);
« no previous file with comments | « gpu/command_buffer/service/feature_info.cc ('k') | gpu/command_buffer/service/gles2_cmd_validation_autogen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698