From d3a250fc8802f10bc22d9f04475867821fa45f57 Mon Sep 17 00:00:00 2001 From: "nfullagar@google.com" Date: Tue, 6 Sep 2011 23:11:53 +0000 Subject: Move PPAPI graphics3d and opengles interfaces out of Dev. BUG= http://code.google.com/p/chromium/issues/detail?id=94320 TEST= various nacl exmaples, try bots Review URL: http://codereview.chromium.org/7737013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99855 0039d316-1c4b-4281-b951-d872f2087c98 --- ppapi/shared_impl/opengles2_impl.cc | 4 ++-- ppapi/shared_impl/opengles2_impl.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'ppapi/shared_impl') diff --git a/ppapi/shared_impl/opengles2_impl.cc b/ppapi/shared_impl/opengles2_impl.cc index d79fb10..400f0bc 100644 --- a/ppapi/shared_impl/opengles2_impl.cc +++ b/ppapi/shared_impl/opengles2_impl.cc @@ -750,7 +750,7 @@ void Viewport( } -const struct PPB_OpenGLES2_Dev ppb_opengles2 = { +const struct PPB_OpenGLES2 ppb_opengles2 = { &ActiveTexture, &AttachShader, &BindAttribLocation, @@ -897,7 +897,7 @@ const struct PPB_OpenGLES2_Dev ppb_opengles2 = { } // namespace -const PPB_OpenGLES2_Dev* OpenGLES2Impl::GetInterface() { +const PPB_OpenGLES2* OpenGLES2Impl::GetInterface() { return &ppb_opengles2; } diff --git a/ppapi/shared_impl/opengles2_impl.h b/ppapi/shared_impl/opengles2_impl.h index ea2a3b7..261ffd2 100644 --- a/ppapi/shared_impl/opengles2_impl.h +++ b/ppapi/shared_impl/opengles2_impl.h @@ -5,14 +5,14 @@ #ifndef PPAPI_SHARED_IMPL_OPENGLES2_IMPL_H_ #define PPAPI_SHARED_IMPL_OPENGLES2_IMPL_H_ -#include "ppapi/c/dev/ppb_opengles_dev.h" +#include "ppapi/c/ppb_opengles.h" #include "ppapi/shared_impl/ppapi_shared_export.h" namespace ppapi { class PPAPI_SHARED_EXPORT OpenGLES2Impl { public: - static const PPB_OpenGLES2_Dev* GetInterface(); + static const PPB_OpenGLES2* GetInterface(); }; } // namespace ppapi -- cgit v1.1