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

Unified Diff: ppapi/shared_impl/opengles2_impl.cc

Issue 8676042: Remove Context3D/Surface3D (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: style Created 9 years, 1 month 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 | « ppapi/proxy/resource_creation_proxy.cc ('k') | ppapi/shared_impl/resource.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/shared_impl/opengles2_impl.cc
diff --git a/ppapi/shared_impl/opengles2_impl.cc b/ppapi/shared_impl/opengles2_impl.cc
index 400f0bc041a8081e1482fa57623734e28a1d0307..2743d2ebbcb4beabd95a22b714dbd9641cc61cce 100644
--- a/ppapi/shared_impl/opengles2_impl.cc
+++ b/ppapi/shared_impl/opengles2_impl.cc
@@ -12,7 +12,6 @@
#include "gpu/command_buffer/client/gles2_implementation.h"
#include "ppapi/shared_impl/graphics_3d_impl.h"
#include "ppapi/thunk/enter.h"
-#include "ppapi/thunk/ppb_context_3d_api.h"
namespace ppapi {
@@ -20,13 +19,8 @@ namespace {
gpu::gles2::GLES2Implementation* GetGLES(PP_Resource context) {
thunk::EnterResource<thunk::PPB_Graphics3D_API> enter_g3d(context, false);
- if (enter_g3d.succeeded()) {
- return static_cast<Graphics3DImpl*>(enter_g3d.object())->gles2_impl();
- } else {
- thunk::EnterResource<thunk::PPB_Context3D_API> enter_c3d(context, true);
- DCHECK(enter_c3d.succeeded());
- return enter_c3d.object()->GetGLES2Impl();
- }
+ DCHECK(enter_g3d.succeeded());
+ return static_cast<Graphics3DImpl*>(enter_g3d.object())->gles2_impl();
}
void ActiveTexture(PP_Resource context_id, GLenum texture) {
« no previous file with comments | « ppapi/proxy/resource_creation_proxy.cc ('k') | ppapi/shared_impl/resource.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698