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

Side by Side Diff: ppapi/native_client/src/shared/ppapi_proxy/plugin_opengles.cc

Issue 7782020: Revert 99855 - Move PPAPI graphics3d and opengles interfaces out of Dev. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 3 months 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 unified diff | Download patch | Annotate | Revision Log
Property Changes:
Added: svn:mergeinfo
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // This file is auto-generated from 5 // This file is auto-generated from
6 // gpu/command_buffer/build_gles2_cmd_buffer.py 6 // gpu/command_buffer/build_gles2_cmd_buffer.py
7 // DO NOT EDIT! 7 // DO NOT EDIT!
8 8
9 #include "native_client/src/shared/ppapi_proxy/plugin_ppb_graphics_3d.h" 9 #include "native_client/src/shared/ppapi_proxy/plugin_ppb_graphics_3d.h"
10 10
11 #include "gpu/command_buffer/client/gles2_implementation.h" 11 #include "gpu/command_buffer/client/gles2_implementation.h"
12 #include "ppapi/c/ppb_opengles.h" 12 #include "ppapi/c/dev/ppb_opengles_dev.h"
13 13
14 using ppapi_proxy::PluginGraphics3D; 14 using ppapi_proxy::PluginGraphics3D;
15 using ppapi_proxy::PluginResource; 15 using ppapi_proxy::PluginResource;
16 16
17 namespace { 17 namespace {
18 18
19 void ActiveTexture(PP_Resource context, GLenum texture) { 19 void ActiveTexture(PP_Resource context, GLenum texture) {
20 PluginGraphics3D::implFromResource(context)->ActiveTexture(texture); 20 PluginGraphics3D::implFromResource(context)->ActiveTexture(texture);
21 } 21 }
22 void AttachShader(PP_Resource context, GLuint program, GLuint shader) { 22 void AttachShader(PP_Resource context, GLuint program, GLuint shader) {
(...skipping 602 matching lines...) Expand 10 before | Expand all | Expand 10 after
625 PluginGraphics3D::implFromResource( 625 PluginGraphics3D::implFromResource(
626 context)->VertexAttribPointer(indx, size, type, normalized, stride, ptr); 626 context)->VertexAttribPointer(indx, size, type, normalized, stride, ptr);
627 } 627 }
628 void Viewport( 628 void Viewport(
629 PP_Resource context, GLint x, GLint y, GLsizei width, GLsizei height) { 629 PP_Resource context, GLint x, GLint y, GLsizei width, GLsizei height) {
630 PluginGraphics3D::implFromResource(context)->Viewport(x, y, width, height); 630 PluginGraphics3D::implFromResource(context)->Viewport(x, y, width, height);
631 } 631 }
632 632
633 } // namespace 633 } // namespace
634 634
635 const PPB_OpenGLES2* PluginGraphics3D::GetOpenGLESInterface() { 635 const PPB_OpenGLES2_Dev* PluginGraphics3D::GetOpenGLESInterface() {
636 const static struct PPB_OpenGLES2 ppb_opengles = { 636 const static struct PPB_OpenGLES2_Dev ppb_opengles = {
637 &ActiveTexture, 637 &ActiveTexture,
638 &AttachShader, 638 &AttachShader,
639 &BindAttribLocation, 639 &BindAttribLocation,
640 &BindBuffer, 640 &BindBuffer,
641 &BindFramebuffer, 641 &BindFramebuffer,
642 &BindRenderbuffer, 642 &BindRenderbuffer,
643 &BindTexture, 643 &BindTexture,
644 &BlendColor, 644 &BlendColor,
645 &BlendEquation, 645 &BlendEquation,
646 &BlendEquationSeparate, 646 &BlendEquationSeparate,
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
772 &VertexAttrib2fv, 772 &VertexAttrib2fv,
773 &VertexAttrib3f, 773 &VertexAttrib3f,
774 &VertexAttrib3fv, 774 &VertexAttrib3fv,
775 &VertexAttrib4f, 775 &VertexAttrib4f,
776 &VertexAttrib4fv, 776 &VertexAttrib4fv,
777 &VertexAttribPointer, 777 &VertexAttribPointer,
778 &Viewport 778 &Viewport
779 }; 779 };
780 return &ppb_opengles; 780 return &ppb_opengles;
781 } 781 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698