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

Unified Diff: ppapi/thunk/ppb_gles_chromium_texture_mapping_thunk.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/thunk/ppb_context_3d_trusted_thunk.cc ('k') | ppapi/thunk/ppb_surface_3d_api.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/thunk/ppb_gles_chromium_texture_mapping_thunk.cc
diff --git a/ppapi/thunk/ppb_gles_chromium_texture_mapping_thunk.cc b/ppapi/thunk/ppb_gles_chromium_texture_mapping_thunk.cc
index 085578a72559a15cbe37796438a82bb9eb456f3e..0963631f7d5f151e01ce1f43c58a2d467cf9b2e2 100644
--- a/ppapi/thunk/ppb_gles_chromium_texture_mapping_thunk.cc
+++ b/ppapi/thunk/ppb_gles_chromium_texture_mapping_thunk.cc
@@ -4,7 +4,6 @@
#include "ppapi/thunk/thunk.h"
#include "ppapi/thunk/enter.h"
-#include "ppapi/thunk/ppb_context_3d_api.h"
#include "ppapi/thunk/ppb_graphics_3d_api.h"
#include "ppapi/thunk/resource_creation_api.h"
@@ -13,7 +12,6 @@ namespace thunk {
namespace {
-typedef EnterResource<PPB_Context3D_API> EnterContext3D;
typedef EnterResource<PPB_Graphics3D_API> EnterGraphics3D;
void* MapTexSubImage2DCHROMIUM(PP_Resource context,
@@ -26,38 +24,18 @@ void* MapTexSubImage2DCHROMIUM(PP_Resource context,
GLenum format,
GLenum type,
GLenum access) {
- {
- EnterContext3D enter(context, false);
- if (enter.succeeded()) {
- return enter.object()->MapTexSubImage2DCHROMIUM(
- target, level, xoffset, yoffset, width, height, format, type, access);
- }
- }
- {
- EnterGraphics3D enter(context, true);
- if (enter.succeeded()) {
- return enter.object()->MapTexSubImage2DCHROMIUM(
- target, level, xoffset, yoffset, width, height, format, type, access);
- }
+ EnterGraphics3D enter(context, true);
+ if (enter.succeeded()) {
+ return enter.object()->MapTexSubImage2DCHROMIUM(
+ target, level, xoffset, yoffset, width, height, format, type, access);
}
return NULL;
}
void UnmapTexSubImage2DCHROMIUM(PP_Resource context, const void* mem) {
- {
- EnterContext3D enter(context, false);
- if (enter.succeeded()) {
- enter.object()->UnmapTexSubImage2DCHROMIUM(mem);
- return;
- }
- }
- {
- EnterGraphics3D enter(context, true);
- if (enter.succeeded()) {
- enter.object()->UnmapTexSubImage2DCHROMIUM(mem);
- return;
- }
- }
+ EnterGraphics3D enter(context, true);
+ if (enter.succeeded())
+ enter.object()->UnmapTexSubImage2DCHROMIUM(mem);
}
const PPB_GLESChromiumTextureMapping_Dev
« no previous file with comments | « ppapi/thunk/ppb_context_3d_trusted_thunk.cc ('k') | ppapi/thunk/ppb_surface_3d_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698