Skip to content

GitLab

T
tangled
Commit b69afa2b authored by bbudge@chromium.org's avatar bbudge@chromium.org
Browse files
Options

Revert 150343 - Add gpu targets to untrusted build, and add Graphics3D code to untrusted build. 

BUG=116317
TEST=builds,manual

With this change, the IPC-based PPAPI proxy builds and runs the tumbler example.
Review URL: https://chromiumcodereview.appspot.com/10796038

TBR=bbudge@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10830197

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150345 0039d316-1c4b-4281-b951-d872f2087c98
parent 1555f8cd
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 359 additions and 612 deletions
gpu/command_buffer/client/ref_counted.h
View file @ b69afa2b
......@@ -5,11 +5,7 @@
#ifndef GPU_COMMAND_BUFFER_CLIENT_REF_COUNTED_H_
#define GPU_COMMAND_BUFFER_CLIENT_REF_COUNTED_H_
// TODO(bbudge) The NaCl SRPC proxy can't depend on base, so we define our own
// ref_counted. This causes duplicate class warnings in the NaCl IPC proxy,
// which uses base. Remove the custom ref_counted class after NaCl has switched
// proxies.
#if defined(__native_client__) && !defined(NACL_PPAPI_IPC_PROXY)
#if defined(__native_client__)
#include "native_client/src/include/ref_counted.h"
namespace gpu {
using nacl::RefCountedThreadSafe;
......
gpu/command_buffer/command_buffer.gyp
View file @ b69afa2b
......@@ -6,16 +6,13 @@
'variables': {
'chromium_code': 1,
},
'includes': [
'command_buffer.gypi',
],
'targets': [
{
'target_name': 'gles2_utils',
'type': '<(component)',
'variables': {
'gles2_utils_target': 1,
},
'include_dirs': [
'<(DEPTH)/third_party/khronos',
],
'all_dependent_settings': {
'include_dirs': [
'<(DEPTH)/third_party/khronos',
......@@ -27,6 +24,17 @@
'export_dependent_settings': [
'../../base/base.gyp:base',
],
'defines': [
'GLES2_UTILS_IMPLEMENTATION',
],
'sources': [
'common/gles2_cmd_format.h',
'common/gles2_cmd_utils.cc',
'common/gles2_cmd_utils.h',
'common/gles2_utils_export.h',
'common/logging.cc',
'common/logging.h',
],
},
],
}
......
gpu/command_buffer/command_buffer.gypi deleted 100644 → 0
View file @ 1555f8cd
# Copyright (c) 2012 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
{
'target_defaults': {
'variables': {
'gles2_utils_target': 0,
},
'target_conditions': [
# This part is shared between the targets defined below.
['gles2_utils_target==1', {
'defines': [
'GLES2_UTILS_IMPLEMENTATION',
],
'include_dirs': [
'<(DEPTH)/third_party/khronos',
],
'sources': [
'common/gles2_cmd_format.h',
'common/gles2_cmd_utils.cc',
'common/gles2_cmd_utils.h',
'common/gles2_utils_export.h',
'common/logging.cc',
'common/logging.h',
],
}],
],
},
}
gpu/command_buffer/command_buffer_untrusted.gyp deleted 100644 → 0
View file @ 1555f8cd
# Copyright (c) 2012 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
{
'variables': {
'chromium_code': 1,
},
'includes': [
'../../native_client/build/untrusted.gypi',
'command_buffer.gypi',
],
'conditions': [
['disable_nacl==0 and disable_nacl_untrusted==0', {
'targets': [
{
'target_name': 'gles2_utils_untrusted',
'type': 'none',
'variables': {
'gles2_utils_target': 1,
'nacl_untrusted_build': 1,
'nlib_target': 'libgles2_utils_untrusted.a',
'build_glibc': 0,
'build_newlib': 1,
},
'dependencies': [
'../../native_client/tools.gyp:prep_toolchain',
'../../base/base_untrusted.gyp:base_untrusted',
],
},
],
}],
],
}
gpu/command_buffer_common.gypi
View file @ b69afa2b
......@@ -11,6 +11,10 @@
'<(DEPTH)/third_party/khronos',
],
},
'dependencies': [
'../base/base.gyp:base',
'command_buffer/command_buffer.gyp:gles2_utils',
],
'sources': [
'command_buffer/common/bitfield_helpers.h',
'command_buffer/common/buffer.h',
......
gpu/gpu.gyp
View file @ b69afa2b
This diff is collapsed.
gpu/gpu_common.gypi
View file @ b69afa2b
This diff is collapsed.
gpu/gpu_untrusted.gyp deleted 100644 → 0
View file @ 1555f8cd
# Copyright (c) 2012 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
{
'variables': {
'chromium_code': 1,
},
'includes': [
'../native_client/build/untrusted.gypi',
'gpu_common.gypi',
],
'conditions': [
['disable_nacl==0 and disable_nacl_untrusted==0', {
'targets': [
{
'target_name': 'gles2_implementation_untrusted',
'type': 'none',
'variables': {
'nacl_untrusted_build': 1,
'nlib_target': 'libgles2_implementation_untrusted.a',
'build_glibc': 0,
'build_newlib': 1,
},
'defines': [
'GLES2_IMPL_IMPLEMENTATION',
],
'include_dirs': [
'../third_party/khronos',
],
'sources': [
'<@(gles2_implementation_source_files)',
],
'dependencies': [
'../native_client/tools.gyp:prep_toolchain',
'../base/base_untrusted.gyp:base_untrusted',
'command_buffer/command_buffer_untrusted.gyp:gles2_utils_untrusted',
'gles2_cmd_helper_untrusted',
],
},
{
'target_name': 'command_buffer_common_untrusted',
'type': 'none',
'variables': {
'nacl_untrusted_build': 1,
'nlib_target': 'libcommand_buffer_common_untrusted.a',
'build_glibc': 0,
'build_newlib': 1,
},
'includes': [
'command_buffer_common.gypi',
],
'dependencies': [
'../native_client/tools.gyp:prep_toolchain',
'../base/base_untrusted.gyp:base_untrusted',
'command_buffer/command_buffer_untrusted.gyp:gles2_utils_untrusted',
],
},
{
'target_name': 'gles2_cmd_helper_untrusted',
'type': 'none',
'variables': {
'nacl_untrusted_build': 1,
'nlib_target': 'libgles2_cmd_helper_untrusted.a',
'build_glibc': 0,
'build_newlib': 1,
},
'includes': [
'gles2_cmd_helper.gypi',
],
'dependencies': [
'../native_client/tools.gyp:prep_toolchain',
'../base/base_untrusted.gyp:base_untrusted',
'command_buffer_client_untrusted',
],
},
{
'target_name': 'command_buffer_client_untrusted',
'type': 'none',
'variables': {
'nacl_untrusted_build': 1,
'nlib_target': 'libcommand_buffer_client_untrusted.a',
'build_glibc': 0,
'build_newlib': 1,
},
'includes': [
'command_buffer_client.gypi',
],
'dependencies': [
'../native_client/tools.gyp:prep_toolchain',
'../base/base_untrusted.gyp:base_untrusted',
'command_buffer_common_untrusted',
],
},
{
'target_name': 'gpu_ipc_untrusted',
'type': 'none',
'variables': {
'nacl_untrusted_build': 1,
'nlib_target': 'libgpu_ipc_untrusted.a',
'build_glibc': 0,
'build_newlib': 1,
},
'includes': [
'gpu_ipc.gypi',
],
'dependencies': [
'../native_client/tools.gyp:prep_toolchain',
'../base/base_untrusted.gyp:base_untrusted',
'command_buffer_common_untrusted',
],
},
],
}],
],
}
ppapi/native_client/native_client.gyp
View file @ b69afa2b
......@@ -208,12 +208,6 @@
'-lirt_browser',
'-lppapi_proxy_untrusted',
'-lppapi_shared_untrusted',
'-lgles2_implementation_untrusted',
'-lgles2_cmd_helper_untrusted',
'-lgles2_utils_untrusted',
'-lcommand_buffer_client_untrusted',
'-lcommand_buffer_common_untrusted',
'-lgpu_ipc_untrusted',
'-lipc_untrusted',
'-lbase_untrusted',
'-lsrpc',
......@@ -257,12 +251,6 @@
'extra_deps64': [
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libppapi_proxy_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libppapi_shared_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libgles2_implementation_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libcommand_buffer_client_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libcommand_buffer_common_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libgpu_ipc_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libgles2_cmd_helper_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libgles2_utils_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libipc_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libbase_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libirt_browser.a',
......@@ -274,12 +262,6 @@
'extra_deps32': [
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libppapi_proxy_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libppapi_shared_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libgles2_implementation_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libcommand_buffer_client_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libcommand_buffer_common_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libgpu_ipc_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libgles2_cmd_helper_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libgles2_utils_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libipc_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libbase_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libirt_browser.a',
......@@ -291,12 +273,6 @@
'extra_deps_newlib64': [
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libppapi_proxy_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libppapi_shared_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libgles2_implementation_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libcommand_buffer_client_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libcommand_buffer_common_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libgpu_ipc_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libgles2_cmd_helper_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libgles2_utils_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libipc_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libbase_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libirt_browser.a',
......@@ -308,12 +284,6 @@
'extra_deps_newlib32': [
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libppapi_proxy_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libppapi_shared_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libgles2_implementation_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libcommand_buffer_client_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libcommand_buffer_common_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libgpu_ipc_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libgles2_cmd_helper_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libgles2_utils_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libipc_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libbase_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libirt_browser.a',
......@@ -325,12 +295,6 @@
'extra_deps_glibc64': [
'<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libppapi_proxy_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libppapi_shared_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libgles2_implementation_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libcommand_buffer_client_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libcommand_buffer_common_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libgpu_ipc_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libgles2_cmd_helper_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libgles2_utils_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libipc_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libbase_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libirt_browser.a',
......@@ -342,12 +306,6 @@
'extra_deps_glibc32': [
'<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libppapi_proxy_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libppapi_shared_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libgles2_implementation_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libcommand_buffer_client_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libcommand_buffer_common_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libgpu_ipc_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libgles2_cmd_helper_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libgles2_utils_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libipc_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libbase_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libirt_browser.a',
......@@ -359,12 +317,6 @@
'extra_deps_arm': [
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libppapi_proxy_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libppapi_shared_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libgles2_implementation_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libcommand_buffer_client_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libcommand_buffer_common_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libgpu_ipc_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libgles2_cmd_helper_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libgles2_utils_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libipc_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libbase_untrusted.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libirt_browser.a',
......@@ -377,12 +329,6 @@
'dependencies': [
'../ppapi_proxy_untrusted.gyp:ppapi_proxy_untrusted',
'../ppapi_shared_untrusted.gyp:ppapi_shared_untrusted',
'../../gpu/command_buffer/command_buffer_untrusted.gyp:gles2_utils_untrusted',
'../../gpu/gpu_untrusted.gyp:command_buffer_client_untrusted',
'../../gpu/gpu_untrusted.gyp:command_buffer_common_untrusted',
'../../gpu/gpu_untrusted.gyp:gles2_implementation_untrusted',
'../../gpu/gpu_untrusted.gyp:gles2_cmd_helper_untrusted',
'../../gpu/gpu_untrusted.gyp:gpu_ipc_untrusted',
'../../ipc/ipc_untrusted.gyp:ipc_untrusted',
'../../base/base_untrusted.gyp:base_untrusted',
'../../native_client/src/untrusted/irt/irt.gyp:irt_browser_lib',
......
ppapi/ppapi_proxy.gypi
View file @ b69afa2b
......@@ -172,6 +172,7 @@
['>(nacl_untrusted_build)==1', {
'sources!': [
'proxy/broker_dispatcher.cc',
'proxy/ppapi_command_buffer_proxy.cc',
'proxy/ppb_audio_input_proxy.cc',
'proxy/ppb_broker_proxy.cc',
'proxy/ppb_buffer_proxy.cc',
......@@ -180,6 +181,7 @@
'proxy/ppb_flash_proxy.cc',
'proxy/ppb_flash_menu_proxy.cc',
'proxy/ppb_flash_message_loop_proxy.cc',
'proxy/ppb_graphics_3d_proxy.cc',
'proxy/ppb_host_resolver_private_proxy.cc',
'proxy/ppb_network_monitor_private_proxy.cc',
'proxy/ppb_pdf_proxy.cc',
......@@ -191,6 +193,7 @@
'proxy/ppb_video_capture_proxy.cc',
'proxy/ppb_video_decoder_proxy.cc',
'proxy/ppb_x509_certificate_private_proxy.cc',
'proxy/ppp_graphics_3d_proxy.cc',
'proxy/ppp_instance_private_proxy.cc',
'proxy/ppp_video_decoder_proxy.cc',
'proxy/serialized_flash_menu.cc',
......
ppapi/ppapi_proxy_untrusted.gyp
View file @ b69afa2b
......@@ -23,22 +23,9 @@
'build_glibc': 0,
'build_newlib': 1,
},
'defines': [
'NACL_PPAPI_IPC_PROXY',
],
'include_dirs': [
'..',
'../third_party/khronos',
],
'dependencies': [
'../native_client/tools.gyp:prep_toolchain',
'<(DEPTH)/native_client/tools.gyp:prep_toolchain',
'../base/base_untrusted.gyp:base_untrusted',
'../gpu/command_buffer/command_buffer_untrusted.gyp:gles2_utils_untrusted',
'../gpu/gpu_untrusted.gyp:command_buffer_client_untrusted',
'../gpu/gpu_untrusted.gyp:command_buffer_common_untrusted',
'../gpu/gpu_untrusted.gyp:gles2_implementation_untrusted',
'../gpu/gpu_untrusted.gyp:gles2_cmd_helper_untrusted',
'../gpu/gpu_untrusted.gyp:gpu_ipc_untrusted',
'../ipc/ipc_untrusted.gyp:ipc_untrusted',
'../ppapi/ppapi_shared_untrusted.gyp:ppapi_shared_untrusted',
],
......
ppapi/ppapi_shared.gypi
View file @ b69afa2b
......@@ -245,6 +245,8 @@
['>(nacl_untrusted_build)==1', {
'sources!': [
'shared_impl/ppb_audio_input_shared.cc',
'shared_impl/ppb_graphics_3d_shared.cc',
'shared_impl/ppb_opengles2_shared.cc',
'shared_impl/ppb_url_util_shared.cc',
'shared_impl/ppb_video_decoder_shared.cc',
'shared_impl/ppb_video_capture_shared.cc',
......@@ -277,6 +279,7 @@
'thunk/ppb_flash_thunk.cc',
'thunk/ppb_flash_message_loop_thunk.cc',
'thunk/ppb_gles_chromium_texture_mapping_thunk.cc',
'thunk/ppb_graphics_3d_thunk.cc',
'thunk/ppb_graphics_3d_trusted_thunk.cc',
'thunk/ppb_host_resolver_private_thunk.cc',
'thunk/ppb_image_data_trusted_thunk.cc',
......
ppapi/ppapi_shared_untrusted.gyp
View file @ b69afa2b
......@@ -23,19 +23,13 @@
'build_glibc': 0,
'build_newlib': 1,
},
'defines': [
'NACL_PPAPI_IPC_PROXY',
],
'include_dirs': [
'..',
'../third_party/khronos',
'../third_party/skia/include/config',
],
'dependencies': [
'../native_client/tools.gyp:prep_toolchain',
'<(DEPTH)/native_client/tools.gyp:prep_toolchain',
'../base/base_untrusted.gyp:base_untrusted',
'../gpu/command_buffer/command_buffer_untrusted.gyp:gles2_utils_untrusted',
'../gpu/gpu_untrusted.gyp:command_buffer_client_untrusted',
'../gpu/gpu_untrusted.gyp:gles2_implementation_untrusted',
'../ipc/ipc_untrusted.gyp:ipc_untrusted',
],
},
],
......
ppapi/proxy/interface_list.cc
View file @ b69afa2b
......@@ -194,6 +194,7 @@ InterfaceList::InterfaceList() {
PPB_Core_Proxy::GetPPB_Core_Interface());
AddPPB(PPB_MESSAGELOOP_DEV_INTERFACE_0_1, API_ID_NONE,
PPB_MessageLoop_Proxy::GetInterface());
#if !defined(OS_NACL)
AddPPB(PPB_OPENGLES2_INTERFACE_1_0, API_ID_NONE,
PPB_OpenGLES2_Shared::GetInterface());
AddPPB(PPB_OPENGLES2_INSTANCEDARRAYS_INTERFACE_1_0, API_ID_NONE,
......@@ -210,7 +211,6 @@ InterfaceList::InterfaceList() {
PPB_OpenGLES2_Shared::GetChromiumMapSubInterface());
AddPPB(PPB_OPENGLES2_QUERY_INTERFACE_1_0, API_ID_NONE,
PPB_OpenGLES2_Shared::GetQueryInterface());
#if !defined(OS_NACL)
AddPPB(PPB_FLASH_PRINT_INTERFACE_1_0, API_ID_PPB_FLASH,
PPB_Flash_Proxy::GetFlashPrintInterface());
#endif
......@@ -250,8 +250,8 @@ InterfaceList::InterfaceList() {
AddPPP(PPP_InputEvent_Proxy::GetInfo());
AddPPP(PPP_Messaging_Proxy::GetInfo());
AddPPP(PPP_MouseLock_Proxy::GetInfo());
AddPPP(PPP_Graphics3D_Proxy::GetInfo());
#if !defined(OS_NACL)
AddPPP(PPP_Graphics3D_Proxy::GetInfo());
AddPPP(PPP_Instance_Private_Proxy::GetInfo());
AddPPP(PPP_VideoCapture_Proxy::GetInfo());
AddPPP(PPP_VideoDecoder_Proxy::GetInfo());
......
ppapi/proxy/ppapi_messages.h
View file @ b69afa2b
......@@ -873,6 +873,7 @@ IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBGraphics2D_Dev_SetScale,
ppapi::HostResource /* graphics_2d */,
float /* scale */)
#if !defined(OS_NACL)
// PPB_Graphics3D.
IPC_SYNC_MESSAGE_ROUTED3_1(PpapiHostMsg_PPBGraphics3D_Create,
PP_Instance /* instance */,
......@@ -911,6 +912,7 @@ IPC_SYNC_MESSAGE_ROUTED2_2(PpapiHostMsg_PPBGraphics3D_GetTransferBuffer,
uint32 /* size */)
IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBGraphics3D_SwapBuffers,
ppapi::HostResource /* graphics_3d */)
#endif // !defined(OS_NACL)
// PPB_ImageData.
IPC_SYNC_MESSAGE_ROUTED4_3(PpapiHostMsg_PPBImageData_Create,
......
ppapi/proxy/resource_creation_proxy.cc
View file @ b69afa2b
......@@ -207,25 +207,6 @@ PP_Resource ResourceCreationProxy::CreateGraphics2D(PP_Instance instance,
is_always_opaque);
}
PP_Resource ResourceCreationProxy::CreateGraphics3D(
PP_Instance instance,
PP_Resource share_context,
const int32_t* attrib_list) {
printf("ResourceCreationProxy::CreateGraphics3D\n");
return PPB_Graphics3D_Proxy::CreateProxyResource(
instance, share_context, attrib_list);
}
PP_Resource ResourceCreationProxy::CreateGraphics3DRaw(
PP_Instance instance,
PP_Resource share_context,
const int32_t* attrib_list) {
printf("ResourceCreationProxy::CreateGraphics3DRaw\n");
// Not proxied. The raw creation function is used only in the implementation
// of the proxy on the host side.
return 0;
}
#if !defined(OS_NACL)
PP_Resource ResourceCreationProxy::CreateAudioInput0_1(
PP_Instance instance,
......@@ -303,6 +284,23 @@ PP_Resource ResourceCreationProxy::CreateNetworkMonitor(
instance, callback, user_data);
}
PP_Resource ResourceCreationProxy::CreateGraphics3D(
PP_Instance instance,
PP_Resource share_context,
const int32_t* attrib_list) {
return PPB_Graphics3D_Proxy::CreateProxyResource(
instance, share_context, attrib_list);
}
PP_Resource ResourceCreationProxy::CreateGraphics3DRaw(
PP_Instance instance,
PP_Resource share_context,
const int32_t* attrib_list) {
// Not proxied. The raw creation function is used only in the implementation
// of the proxy on the host side.
return 0;
}
PP_Resource ResourceCreationProxy::CreateScrollbar(PP_Instance instance,
PP_Bool vertical) {
NOTIMPLEMENTED(); // Not proxied yet.
......
ppapi/proxy/resource_creation_proxy.h
View file @ b69afa2b
......@@ -105,13 +105,6 @@ class ResourceCreationProxy : public InterfaceProxy,
virtual PP_Resource CreateGraphics2D(PP_Instance pp_instance,
const PP_Size& size,
PP_Bool is_always_opaque) OVERRIDE;
virtual PP_Resource CreateGraphics3D(PP_Instance instance,
PP_Resource share_context,
const int32_t* attrib_list) OVERRIDE;
virtual PP_Resource CreateGraphics3DRaw(
PP_Instance instance,
PP_Resource share_context,
const int32_t* attrib_list) OVERRIDE;
#if !defined(OS_NACL)
virtual PP_Resource CreateAudioInput0_1(
PP_Instance instance,
......@@ -134,6 +127,13 @@ class ResourceCreationProxy : public InterfaceProxy,
virtual PP_Resource CreateFlashMenu(PP_Instance instance,
const PP_Flash_Menu* menu_data) OVERRIDE;
virtual PP_Resource CreateFlashMessageLoop(PP_Instance instance) OVERRIDE;
virtual PP_Resource CreateGraphics3D(PP_Instance instance,
PP_Resource share_context,
const int32_t* attrib_list) OVERRIDE;
virtual PP_Resource CreateGraphics3DRaw(
PP_Instance instance,
PP_Resource share_context,
const int32_t* attrib_list) OVERRIDE;
virtual PP_Resource CreateHostResolverPrivate(PP_Instance instance) OVERRIDE;
virtual PP_Resource CreateNetworkMonitor(
PP_Instance instance,
......
ppapi/shared_impl/ppb_image_data_shared.cc
View file @ b69afa2b
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "build/build_config.h"
#include "ppapi/shared_impl/ppb_image_data_shared.h"
#if !defined(OS_NACL)
#include "third_party/skia/include/core/SkTypes.h"
#endif
namespace ppapi {
// static
PP_ImageDataFormat PPB_ImageData_Shared::GetNativeImageDataFormat() {
#if !defined(OS_NACL)
if (SK_B32_SHIFT == 0)
return PP_IMAGEDATAFORMAT_BGRA_PREMUL;
else if (SK_R32_SHIFT == 0)
return PP_IMAGEDATAFORMAT_RGBA_PREMUL;
else
return PP_IMAGEDATAFORMAT_BGRA_PREMUL; // Default to something on failure.
#else
// In NaCl, just default to something. If we're wrong, it will be converted
// later.
// TODO(dmichael): Really proxy this.
return PP_IMAGEDATAFORMAT_BGRA_PREMUL;
#endif
}
// static
......
ppapi/thunk/interfaces_ppb_public_dev.h
View file @ b69afa2b
......@@ -10,6 +10,7 @@
PROXIED_API(PPB_AudioInput)
PROXIED_API(PPB_Buffer)
UNPROXIED_API(PPB_DirectoryReader)
PROXIED_API(PPB_Graphics3D)
UNPROXIED_API(PPB_LayerCompositor)
UNPROXIED_API(PPB_Scrollbar)
PROXIED_API(PPB_VideoCapture)
......
ppapi/thunk/interfaces_ppb_public_stable.h
View file @ b69afa2b
......@@ -23,7 +23,6 @@ PROXIED_API(PPB_FileIO)
PROXIED_API(PPB_FileRef)
PROXIED_API(PPB_FileSystem)
PROXIED_API(PPB_Graphics2D)
PROXIED_API(PPB_Graphics3D)
PROXIED_API(PPB_ImageData)
PROXIED_API(PPB_Instance)
PROXIED_API(PPB_URLLoader)
......@@ -54,7 +53,6 @@ PROXIED_IFACE(PPB_FileIO, PPB_FILEIO_INTERFACE_1_0, PPB_FileIO_1_0)
PROXIED_IFACE(PPB_FileRef, PPB_FILEREF_INTERFACE_1_0, PPB_FileRef_1_0)
PROXIED_IFACE(PPB_FileSystem, PPB_FILESYSTEM_INTERFACE_1_0, PPB_FileSystem_1_0)
PROXIED_IFACE(PPB_Graphics2D, PPB_GRAPHICS_2D_INTERFACE_1_0, PPB_Graphics2D_1_0)
PROXIED_IFACE(PPB_Graphics3D, PPB_GRAPHICS_3D_INTERFACE_1_0, PPB_Graphics3D_1_0)
PROXIED_IFACE(PPB_ImageData, PPB_IMAGEDATA_INTERFACE_1_0, PPB_ImageData_1_0)
PROXIED_IFACE(PPB_Instance, PPB_GAMEPAD_INTERFACE_1_0, PPB_Gamepad_1_0)
PROXIED_IFACE(PPB_Instance, PPB_INSTANCE_INTERFACE_1_0, PPB_Instance_1_0)
......@@ -84,6 +82,7 @@ PROXIED_IFACE(NoAPIName, PPB_AUDIO_CONFIG_INTERFACE_1_0, PPB_AudioConfig_1_0)
PROXIED_IFACE(NoAPIName, PPB_AUDIO_CONFIG_INTERFACE_1_1, PPB_AudioConfig_1_1)
#if !defined(OS_NACL) // TODO(bbudge) Port to NaCl.
PROXIED_IFACE(PPB_Graphics3D, PPB_GRAPHICS_3D_INTERFACE_1_0, PPB_Graphics3D_1_0)
PROXIED_IFACE(PPB_Instance, PPB_MOUSECURSOR_INTERFACE_1_0, PPB_MouseCursor_1_0)
#endif // !defined(OS_NACL)
......
ppapi/thunk/resource_creation_api.h
View file @ b69afa2b
......@@ -110,12 +110,6 @@ class ResourceCreationAPI {
virtual PP_Resource CreateGraphics2D(PP_Instance instance,
const PP_Size& size,
PP_Bool is_always_opaque) = 0;
virtual PP_Resource CreateGraphics3D(PP_Instance instance,
PP_Resource share_context,
const int32_t* attrib_list) = 0;
virtual PP_Resource CreateGraphics3DRaw(PP_Instance instance,
PP_Resource share_context,
const int32_t* attrib_list) = 0;
#if !defined(OS_NACL)
virtual PP_Resource CreateAudioInput0_1(
PP_Instance instance,
......@@ -137,6 +131,12 @@ class ResourceCreationAPI {
virtual PP_Resource CreateFlashMenu(PP_Instance instance,
const PP_Flash_Menu* menu_data) = 0;
virtual PP_Resource CreateFlashMessageLoop(PP_Instance instance) = 0;
virtual PP_Resource CreateGraphics3D(PP_Instance instance,
PP_Resource share_context,
const int32_t* attrib_list) = 0;
virtual PP_Resource CreateGraphics3DRaw(PP_Instance instance,
PP_Resource share_context,
const int32_t* attrib_list) = 0;
virtual PP_Resource CreateHostResolverPrivate(PP_Instance instance) = 0;
virtual PP_Resource CreateNetworkMonitor(
PP_Instance instance,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment