ppapi/native_client/src/shared/ppapi_proxy/command_buffer_nacl.h - Issue 7782020: Revert 99855 - Move PPAPI graphics3d and opengles interfaces out of Dev.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: ppapi/native_client/src/shared/ppapi_proxy/command_buffer_nacl.h

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

« no previous file with comments | « ppapi/native_client/src/shared/ppapi_proxy/browser_ppb_graphics_3d_rpc_server.cc ('k') | ppapi/native_client/src/shared/ppapi_proxy/plugin_opengles.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Property Changes:

Added: svn:mergeinfo

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 The Native Client 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 #ifndef NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_COMMAND_BUFFER_NACL_H	5 #ifndef NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_COMMAND_BUFFER_NACL_H

6 #define NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_COMMAND_BUFFER_NACL_H	6 #define NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_COMMAND_BUFFER_NACL_H

7	7

8 #include "gpu/command_buffer/common/command_buffer.h"	8 #include "gpu/command_buffer/common/command_buffer.h"

9 #include "ppapi/c/pp_graphics_3d.h"	9 #include "ppapi/c/dev/pp_graphics_3d_dev.h"

	10 #include "ppapi/c/dev/ppb_graphics_3d_trusted_dev.h"

10 #include "ppapi/c/pp_resource.h"	11 #include "ppapi/c/pp_resource.h"

11 #include "ppapi/c/trusted/ppb_graphics_3d_trusted.h"

12	12

13 struct PPB_Core;	13 struct PPB_Core;

14	14

15 // A CommandBuffer proxy implementation that uses trusted PPAPI interface to	15 // A CommandBuffer proxy implementation that uses trusted PPAPI interface to

16 // access a CommandBuffer.	16 // access a CommandBuffer.

17	17

18 class CommandBufferNacl : public gpu::CommandBuffer {	18 class CommandBufferNacl : public gpu::CommandBuffer {

19 public:	19 public:

20 // This class will addref the graphics 3d resource using the core interface.	20 // This class will addref the graphics 3d resource using the core interface.

21 CommandBufferNacl(PP_Resource graphics_3d, const PPB_Core* iface_core);	21 CommandBufferNacl(PP_Resource graphics_3d, const PPB_Core* iface_core);

(...skipping 29 matching lines...) Expand all Loading...
51 const PPB_Core* iface_core_;	51 const PPB_Core* iface_core_;

52 gpu::Buffer buffer_;	52 gpu::Buffer buffer_;

53 State last_state_;	53 State last_state_;

54	54

55 static gpu::CommandBuffer::State PpapiToGpuState(PP_Graphics3DTrustedState s);	55 static gpu::CommandBuffer::State PpapiToGpuState(PP_Graphics3DTrustedState s);

56 static gpu::CommandBuffer::State ErrorGpuState();	56 static gpu::CommandBuffer::State ErrorGpuState();

57 static gpu::Buffer BufferFromShm(int shm_handle, uint32_t shm_size);	57 static gpu::Buffer BufferFromShm(int shm_handle, uint32_t shm_size);

58 };	58 };

59	59

60 #endif // NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_COMMAND_BUFFER_NACL_H	60 #endif // NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_COMMAND_BUFFER_NACL_H

OLD	NEW