Remove remaining traces of CreateGpuMemoryBufferImageCHROMIUM

gpu/command_buffer/client/gles2_implementation.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // A class to emulate GLES2 over command buffers.
 
 #include "gpu/command_buffer/client/gles2_implementation.h"
 
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
@@ skipping 3754 matching lines @@
   // Clears the bucket so if the command fails nothing will be in it.
   helper_->SetBucketSize(kResultBucketId, 0);
   helper_->GetString(name, kResultBucketId);
   std::string str;
   if (GetBucketAsString(kResultBucketId, &str)) {
     // Adds extensions implemented on client side only.
     if (name == GL_EXTENSIONS) {
       str += std::string(str.empty() ? "" : " ") +
              "GL_EXT_unpack_subimage "
              "GL_CHROMIUM_map_sub "
-             "GL_CHROMIUM_image "
-             "GL_CHROMIUM_gpu_memory_buffer_image";
+             "GL_CHROMIUM_image";
       if (capabilities_.future_sync_points)
         str += " GL_CHROMIUM_future_sync_point";
     }
 
     // Because of WebGL the extensions can change. We have to cache each unique
     // result since we don't know when the client will stop referring to a
     // previous one it queries.
     // TODO: Here we could save memory by defining RequestExtensions
     // invalidating the GL_EXTENSIONS string. http://crbug.com/586414
     const std::string& cache = *gl_strings_.insert(str).first;
@@ skipping 2405 matching lines @@
     case GL_RGB_YCBCR_422_CHROMIUM:
     case GL_RGB_YCBCR_420V_CHROMIUM:
     case GL_RGB_YCRCB_420_CHROMIUM:
     case GL_BGRA_EXT:
       return true;
     default:
       return false;
   }
 }
 
-bool CreateGpuMemoryBufferValidInternalFormat(GLenum internalformat) {
-  switch (internalformat) {
-    case GL_RGB:
-    case GL_RGBA:
-      return true;
-    default:
-      return false;
-  }
-}
-
-bool ValidImageUsage(GLenum usage) {
-  return usage == GL_READ_WRITE_CHROMIUM;
-}
-
 }  // namespace
 
 GLuint GLES2Implementation::CreateImageCHROMIUMHelper(ClientBuffer buffer,
                                                       GLsizei width,
                                                       GLsizei height,
                                                       GLenum internalformat) {
   if (width <= 0) {
     SetGLError(GL_INVALID_VALUE, "glCreateImageCHROMIUM", "width <= 0");
     return 0;
   }
@@ skipping 44 matching lines @@
 }
 
 void GLES2Implementation::DestroyImageCHROMIUM(GLuint image_id) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glDestroyImageCHROMIUM("
       << image_id << ")");
   DestroyImageCHROMIUMHelper(image_id);
   CheckGLError();
 }
 
-GLuint GLES2Implementation::CreateGpuMemoryBufferImageCHROMIUMHelper(
-    GLsizei width,
-    GLsizei height,
-    GLenum internalformat,
-    GLenum usage) {
-  if (width <= 0) {
-    SetGLError(
-        GL_INVALID_VALUE, "glCreateGpuMemoryBufferImageCHROMIUM", "width <= 0");
-    return 0;
-  }
-
-  if (height <= 0) {
-    SetGLError(GL_INVALID_VALUE,
-               "glCreateGpuMemoryBufferImageCHROMIUM",
-               "height <= 0");
-    return 0;
-  }
-
-  if (!CreateGpuMemoryBufferValidInternalFormat(internalformat)) {
-    SetGLError(GL_INVALID_VALUE,
-               "glCreateGpuMemoryBufferImageCHROMIUM",
-               "invalid format");
-    return 0;
-  }
-
-  if (!ValidImageUsage(usage)) {
-    SetGLError(GL_INVALID_VALUE,
-               "glCreateGpuMemoryBufferImageCHROMIUM",
-               "invalid usage");
-    return 0;
-  }
-
-  // Flush the command stream to ensure ordering in case the newly
-  // returned image_id has recently been in use with a different buffer.
-  helper_->CommandBufferHelper::Flush();
-  int32_t image_id = gpu_control_->CreateGpuMemoryBufferImage(
-      width, height, internalformat, usage);
-  if (image_id < 0) {
-    SetGLError(GL_OUT_OF_MEMORY,
-               "glCreateGpuMemoryBufferImageCHROMIUM",
-               "image_id < 0");
-    return 0;
-  }
-  return image_id;
-}
-
-GLuint GLES2Implementation::CreateGpuMemoryBufferImageCHROMIUM(
-    GLsizei width,
-    GLsizei height,
-    GLenum internalformat,
-    GLenum usage) {
-  GPU_CLIENT_SINGLE_THREAD_CHECK();
-  GPU_CLIENT_LOG("[" << GetLogPrefix()
-                     << "] glCreateGpuMemoryBufferImageCHROMIUM(" << width
-                     << ", " << height << ", "
-                     << GLES2Util::GetStringImageInternalFormat(internalformat)
-                     << ", " << GLES2Util::GetStringImageUsage(usage) << ")");
-  GLuint image_id = CreateGpuMemoryBufferImageCHROMIUMHelper(
-      width, height, internalformat, usage);
-  CheckGLError();
-  return image_id;
-}
-
 bool GLES2Implementation::ValidateSize(const char* func, GLsizeiptr size) {
   if (size < 0) {
     SetGLError(GL_INVALID_VALUE, func, "size < 0");
     return false;
   }
   if (!base::IsValueInRangeForNumericType<int32_t>(size)) {
     SetGLError(GL_INVALID_OPERATION, func, "size more than 32-bit");
     return false;
   }
   return true;
@@ skipping 748 matching lines @@
   CheckGLError();
 }
 
 // Include the auto-generated part of this file. We split this because it means
 // we can easily edit the non-auto generated parts right here in this file
 // instead of having to edit some template or the code generator.
 #include "gpu/command_buffer/client/gles2_implementation_impl_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu