Index: gpu/command_buffer/client/gles2_implementation.cc |
diff --git a/gpu/command_buffer/client/gles2_implementation.cc b/gpu/command_buffer/client/gles2_implementation.cc |
index 9285b6d82ef1721de747ec98f02f3bc47acedf21..8d822d36744e3bb4b219de0c272fdeaab8b9522a 100644 |
--- a/gpu/command_buffer/client/gles2_implementation.cc |
+++ b/gpu/command_buffer/client/gles2_implementation.cc |
@@ -86,7 +86,7 @@ GLES2Implementation::GLES2Implementation( |
ShareGroup* share_group, |
TransferBufferInterface* transfer_buffer, |
bool bind_generates_resource, |
- ImageFactory* image_factory) |
+ GpuControl* gpu_control) |
: helper_(helper), |
transfer_buffer_(transfer_buffer), |
angle_pack_reverse_row_order_status_(kUnknownExtensionStatus), |
@@ -111,7 +111,7 @@ GLES2Implementation::GLES2Implementation( |
use_count_(0), |
current_query_(NULL), |
error_message_callback_(NULL), |
- image_factory_(image_factory) { |
+ gpu_control_(gpu_control) { |
GPU_DCHECK(helper); |
GPU_DCHECK(transfer_buffer); |
@@ -165,7 +165,7 @@ bool GLES2Implementation::Initialize( |
query_tracker_.reset(new QueryTracker(mapped_memory_.get())); |
buffer_tracker_.reset(new BufferTracker(mapped_memory_.get())); |
- gpu_memory_buffer_tracker_.reset(new GpuMemoryBufferTracker(image_factory_)); |
+ gpu_memory_buffer_tracker_.reset(new GpuMemoryBufferTracker(gpu_control_)); |
#if defined(GLES2_SUPPORT_CLIENT_SIDE_ARRAYS) |
GetIdHandler(id_namespaces::kBuffers)->MakeIds( |
@@ -2086,13 +2086,10 @@ const GLubyte* GLES2Implementation::GetStringHelper(GLenum name) { |
case GL_EXTENSIONS: |
str += std::string(str.empty() ? "" : " ") + |
"GL_CHROMIUM_flipy " |
+ "GL_CHROMIUM_map_image " |
piman
2013/08/13 00:38:24
I think this will enable the map image codepath in
reveman
2013/08/13 01:48:26
it would fail at the moment but you would have to
|
"GL_CHROMIUM_map_sub " |
"GL_CHROMIUM_shallow_flush " |
"GL_EXT_unpack_subimage"; |
- if (image_factory_ != NULL) { |
- // The first space character is intentional. |
- str += " GL_CHROMIUM_map_image"; |
- } |
break; |
default: |
break; |