From 883d9ff6b5bb09dec935221af379300a813a4d63 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 7 Jun 2016 00:00:28 +0200 Subject: [PATCH] Add HAVE_SHADERPIPELINE define --- Makefile.common | 4 ++++ Makefile.ps3 | 2 +- gfx/drivers_shader/shader_gl_cg.c | 4 ++++ gfx/drivers_shader/shader_glsl.c | 4 ++++ menu/drivers/xmb.c | 2 ++ menu/drivers_display/menu_display_gl.c | 2 +- menu/drivers_display/menu_display_vulkan.c | 4 ++++ menu/menu_setting.c | 2 ++ pkg/android/phoenix/jni/Android.mk | 2 +- pkg/android/phoenix/jni/Android2.mk | 2 +- pkg/apple/RetroArch.xcodeproj/project.pbxproj | 4 ++++ pkg/apple/RetroArch_PPC.xcodeproj/project.pbxproj | 2 ++ pkg/apple/RetroArch_iOS.xcodeproj/project.pbxproj | 9 +++++++++ pkg/msvc/msvc-2010/RetroArch-msvc2010.vcxproj | 8 ++++---- pkg/qnx/bb10/.cproject | 7 +++++++ qb/config.params.sh | 1 + 16 files changed, 51 insertions(+), 8 deletions(-) diff --git a/Makefile.common b/Makefile.common index 43539b25c2..bc5d1a7c38 100644 --- a/Makefile.common +++ b/Makefile.common @@ -56,6 +56,10 @@ ifeq ($(HAVE_FILE_LOGGER), 1) CFLAGS += -DHAVE_FILE_LOGGER endif +ifeq ($(HAVE_SHADERPIPELINE), 1) + CFLAGS += -DHAVE_SHADERPIPELINE +endif + CFLAGS += -I./libretro-common/include # Switches diff --git a/Makefile.ps3 b/Makefile.ps3 index 9738535523..59017bd929 100644 --- a/Makefile.ps3 +++ b/Makefile.ps3 @@ -68,7 +68,7 @@ ifeq ($(HAVE_RLAUNCH), 1) DEFINES += -DHAVE_RLAUNCH endif -DEFINES += -DHAVE_MENU -DHAVE_RGUI -DHAVE_XMB -DHAVE_MATERIALUI -DRARCH_INTERNAL -DMSB_FIRST -DHAVE_OVERLAY +DEFINES += -DHAVE_MENU -DHAVE_RGUI -DHAVE_XMB -DHAVE_MATERIALUI -DHAVE_SHADERPIPELINE -DRARCH_INTERNAL -DMSB_FIRST -DHAVE_OVERLAY ifeq ($(HAVE_GCMGL), 1) DEFINES += -DHAVE_GCMGL diff --git a/gfx/drivers_shader/shader_gl_cg.c b/gfx/drivers_shader/shader_gl_cg.c index 69c7ae4ec5..c4801fc388 100644 --- a/gfx/drivers_shader/shader_gl_cg.c +++ b/gfx/drivers_shader/shader_gl_cg.c @@ -43,7 +43,9 @@ #include "../../managers/state_manager.h" #include "../video_state_tracker.h" +#ifdef HAVE_SHADERPIPELINE #include "../drivers/gl_shaders/pipeline_xmb_ribbon_simple.cg.h" +#endif #define SEMANTIC_TEXCOORD 0x92ee91cdU #define SEMANTIC_TEXCOORD0 0xf0c0cb9dU @@ -1051,6 +1053,7 @@ static void *gl_cg_init(void *data, const char *path) gl_cg_set_shaders(cg->prg[1].fprg, cg->prg[1].vprg); +#ifdef HAVE_SHADERPIPELINE shader_prog_info.combined = stock_xmb_simple; shader_prog_info.is_file = false; @@ -1070,6 +1073,7 @@ static void *gl_cg_init(void *data, const char *path) &cg->prg[VIDEO_SHADER_MENU_SEC], &shader_prog_info); gl_cg_set_program_base_attrib(cg, VIDEO_SHADER_MENU_SEC); +#endif gl_cg_reset_attrib(cg); diff --git a/gfx/drivers_shader/shader_glsl.c b/gfx/drivers_shader/shader_glsl.c index 9bac8608ef..dc47c003e0 100644 --- a/gfx/drivers_shader/shader_glsl.c +++ b/gfx/drivers_shader/shader_glsl.c @@ -124,6 +124,7 @@ static const char *glsl_prefixes[] = { #include "../drivers/gl_shaders/core_alpha_blend.glsl.vert.h" #include "../drivers/gl_shaders/core_alpha_blend.glsl.frag.h" +#ifdef HAVE_SHADERPIPELINE #include "../drivers/gl_shaders/legacy_pipeline_xmb_ribbon_simple.glsl.vert.h" #include "../drivers/gl_shaders/modern_pipeline_xmb_ribbon_simple.glsl.vert.h" #include "../drivers/gl_shaders/pipeline_xmb_ribbon_simple.glsl.frag.h" @@ -132,6 +133,7 @@ static const char *glsl_prefixes[] = { #include "../drivers/gl_shaders/modern_pipeline_xmb_ribbon.glsl.vert.h" #include "../drivers/gl_shaders/pipeline_xmb_ribbon.glsl.frag.h" #endif +#endif typedef struct glsl_shader_data { @@ -902,6 +904,7 @@ static void *gl_glsl_init(void *data, const char *path) glsl->uniforms[VIDEO_SHADER_STOCK_BLEND] = glsl->uniforms[0]; } +#ifdef HAVE_SHADERPIPELINE #if defined(HAVE_OPENGLES2) shader_prog_info.vertex = stock_vertex_xmb_simple_legacy; shader_prog_info.fragment = stock_fragment_xmb_simple; @@ -929,6 +932,7 @@ static void *gl_glsl_init(void *data, const char *path) &shader_prog_info); gl_glsl_find_uniforms(glsl, 0, glsl->prg[VIDEO_SHADER_MENU_SEC].id, &glsl->uniforms[VIDEO_SHADER_MENU_SEC]); +#endif gl_glsl_reset_attrib(glsl); diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index 5b132022c8..1ab2471083 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -1954,6 +1954,7 @@ static void xmb_draw_bg( menu_display_blend_begin(); menu_display_set_viewport(); +#ifdef HAVE_SHADERPIPELINE if (settings->menu.shader_pipeline > 0) { draw.color = xmb_gradient_ident(); @@ -1972,6 +1973,7 @@ static void xmb_draw_bg( menu_display_draw_pipeline(&draw); } else +#endif { if (!running && draw.texture) draw.color = &coord_white[0]; diff --git a/menu/drivers_display/menu_display_gl.c b/menu/drivers_display/menu_display_gl.c index 01f6bb54a8..cffc28704c 100644 --- a/menu/drivers_display/menu_display_gl.c +++ b/menu/drivers_display/menu_display_gl.c @@ -153,7 +153,7 @@ static void menu_display_gl_draw(void *data) static void menu_display_gl_draw_pipeline(void *data) { -#if defined(HAVE_GLSL) || defined(HAVE_CG) +#ifdef HAVE_SHADERPIPELINE video_shader_ctx_info_t shader_info; menu_display_ctx_draw_t *draw = (menu_display_ctx_draw_t*)data; struct uniform_info uniform_param = {0}; diff --git a/menu/drivers_display/menu_display_vulkan.c b/menu/drivers_display/menu_display_vulkan.c index ac230d6095..580bcee2bb 100644 --- a/menu/drivers_display/menu_display_vulkan.c +++ b/menu/drivers_display/menu_display_vulkan.c @@ -95,6 +95,7 @@ static void menu_display_vk_viewport(void *data) static void menu_display_vk_draw_pipeline(void *data) { +#ifdef HAVE_SHADERPIPELINE menu_display_ctx_draw_t *draw = (menu_display_ctx_draw_t*)data; vk_t *vk = (vk_t*)video_driver_get_ptr(false); video_coord_array_t *ca = NULL; @@ -111,6 +112,7 @@ static void menu_display_vk_draw_pipeline(void *data) draw->pipeline.backend_data = &t; t += 0.01; +#endif } static void menu_display_vk_draw(void *data) @@ -166,6 +168,7 @@ static void menu_display_vk_draw(void *data) switch (draw->pipeline.id) { +#ifdef HAVE_SHADERPIPELINE case VIDEO_SHADER_MENU: case VIDEO_SHADER_MENU_SEC: { @@ -182,6 +185,7 @@ static void menu_display_vk_draw(void *data) vulkan_draw_triangles(vk, &call); break; } +#endif default: { diff --git a/menu/menu_setting.c b/menu/menu_setting.c index b19b8007ce..10655aee10 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -6060,6 +6060,7 @@ static bool setting_append_list( general_write_handler, general_read_handler); +#ifdef HAVE_SHADERPIPELINE CONFIG_UINT( list, list_info, &settings->menu.shader_pipeline, @@ -6072,6 +6073,7 @@ static bool setting_append_list( general_write_handler, general_read_handler); menu_settings_list_current_add_range(list, list_info, 0, 2, 1, true, true); +#endif CONFIG_UINT( list, list_info, diff --git a/pkg/android/phoenix/jni/Android.mk b/pkg/android/phoenix/jni/Android.mk index 84da4db8f0..f3ae77bede 100644 --- a/pkg/android/phoenix/jni/Android.mk +++ b/pkg/android/phoenix/jni/Android.mk @@ -53,7 +53,7 @@ else GLES_LIB := -lGLESv2 endif -DEFINES += -DRARCH_MOBILE -DHAVE_GRIFFIN -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_FBO -DHAVE_OVERLAY -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_DYLIB -DHAVE_EGL -DHAVE_GLSL -DHAVE_MENU -DHAVE_RGUI -DHAVE_ZLIB -DHAVE_ZLIB_DEFLATE -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DINLINE=inline -DHAVE_THREADS -D__LIBRETRO__ -DHAVE_RSOUND -DHAVE_NETPLAY -DHAVE_NETWORKING -DRARCH_INTERNAL -DHAVE_FILTERS_BUILTIN -DHAVE_MATERIALUI -DHAVE_XMB -DHAVE_LIBRETRODB -DHAVE_STB_FONT +DEFINES += -DRARCH_MOBILE -DHAVE_GRIFFIN -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_FBO -DHAVE_OVERLAY -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_DYLIB -DHAVE_EGL -DHAVE_GLSL -DHAVE_MENU -DHAVE_RGUI -DHAVE_ZLIB -DHAVE_ZLIB_DEFLATE -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DINLINE=inline -DHAVE_THREADS -D__LIBRETRO__ -DHAVE_RSOUND -DHAVE_NETPLAY -DHAVE_NETWORKING -DRARCH_INTERNAL -DHAVE_FILTERS_BUILTIN -DHAVE_MATERIALUI -DHAVE_XMB -DHAVE_SHADERPIPELINE -DHAVE_LIBRETRODB -DHAVE_STB_FONT DEFINES += -DWANT_IFADDRS ifeq ($(HAVE_VULKAN),1) diff --git a/pkg/android/phoenix/jni/Android2.mk b/pkg/android/phoenix/jni/Android2.mk index 0da87774d7..11f93147a1 100644 --- a/pkg/android/phoenix/jni/Android2.mk +++ b/pkg/android/phoenix/jni/Android2.mk @@ -53,7 +53,7 @@ else GLES_LIB := -lGLESv2 endif -DEFINES += -DRARCH_MOBILE -DHAVE_GRIFFIN -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_FBO -DHAVE_OVERLAY -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_DYLIB -DHAVE_GLSL -DHAVE_MENU -DHAVE_RGUI -DHAVE_ZLIB -DHAVE_ZLIB_DEFLATE -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DINLINE=inline -DHAVE_THREADS -D__LIBRETRO__ -DHAVE_RSOUND -DHAVE_NETPLAY -DHAVE_NETWORKING -DRARCH_INTERNAL -DHAVE_FILTERS_BUILTIN -DHAVE_MATERIALUI -DHAVE_XMB -std=gnu99 -DHAVE_LIBRETRODB -DHAVE_STB_FONT +DEFINES += -DRARCH_MOBILE -DHAVE_GRIFFIN -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_FBO -DHAVE_OVERLAY -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_DYLIB -DHAVE_GLSL -DHAVE_MENU -DHAVE_RGUI -DHAVE_ZLIB -DHAVE_ZLIB_DEFLATE -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DINLINE=inline -DHAVE_THREADS -D__LIBRETRO__ -DHAVE_RSOUND -DHAVE_NETPLAY -DHAVE_NETWORKING -DRARCH_INTERNAL -DHAVE_FILTERS_BUILTIN -DHAVE_MATERIALUI -DHAVE_XMB -DHAVE_SHADERPIPELINE -std=gnu99 -DHAVE_LIBRETRODB -DHAVE_STB_FONT DEFINES += -DWANT_IFADDRS ifeq ($(HAVE_VULKAN),1) diff --git a/pkg/apple/RetroArch.xcodeproj/project.pbxproj b/pkg/apple/RetroArch.xcodeproj/project.pbxproj index ecf7efc30f..dd6055a15c 100644 --- a/pkg/apple/RetroArch.xcodeproj/project.pbxproj +++ b/pkg/apple/RetroArch.xcodeproj/project.pbxproj @@ -417,6 +417,7 @@ "-DHAVE_ZARCH", "-DHAVE_HID", "-DHAVE_XMB", + "-DHAVE_SHADERPIPELINE", "-DHAVE_MMAP", "-DHAVE_LIBRETRODB", ); @@ -481,6 +482,7 @@ "-DHAVE_ZARCH", "-DHAVE_HID", "-DHAVE_XMB", + "-DHAVE_SHADERPIPELINE", "-DHAVE_MMAP", "-DHAVE_LIBRETRODB", ); @@ -546,6 +548,7 @@ "-DHAVE_ZARCH", "-DHAVE_HID", "-DHAVE_XMB", + "-DHAVE_SHADERPIPELINE", "-DHAVE_MMAP", "-DHAVE_LIBRETRODB", ); @@ -609,6 +612,7 @@ "-DHAVE_ZARCH", "-DHAVE_HID", "-DHAVE_XMB", + "-DHAVE_SHADERPIPELINE", "-DHAVE_MMAP", "-DHAVE_LIBRETRODB", ); diff --git a/pkg/apple/RetroArch_PPC.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_PPC.xcodeproj/project.pbxproj index 0d98b62449..0a69db10d3 100644 --- a/pkg/apple/RetroArch_PPC.xcodeproj/project.pbxproj +++ b/pkg/apple/RetroArch_PPC.xcodeproj/project.pbxproj @@ -315,6 +315,7 @@ "-DHAVE_ZARCH", "-DHAVE_HID", "-DHAVE_XMB", + "-DHAVE_SHADERPIPELINE", "-DHAVE_MMAP", "-DHAVE_LIBRETRODB", "-DHAVE_FILTERS_BUILTIN", @@ -387,6 +388,7 @@ "-DHAVE_ZARCH", "-DHAVE_HID", "-DHAVE_XMB", + "-DHAVE_SHADERPIPELINE", "-DHAVE_MMAP", "-DHAVE_LIBRETRODB", "-DHAVE_FILTERS_BUILTIN", diff --git a/pkg/apple/RetroArch_iOS.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_iOS.xcodeproj/project.pbxproj index 7bd5ff1c10..9781baba64 100644 --- a/pkg/apple/RetroArch_iOS.xcodeproj/project.pbxproj +++ b/pkg/apple/RetroArch_iOS.xcodeproj/project.pbxproj @@ -553,6 +553,7 @@ "-DHAVE_MATERIALUI", "-DHAVE_ZARCH", "-DHAVE_XMB", + "-DHAVE_SHADERPIPELINE", "-D_LZMA_UINT32_IS_ULONG", "-DHAVE_MFI", "-DHAVE_BTSTACK", @@ -630,6 +631,7 @@ "-DHAVE_MATERIALUI", "-DHAVE_ZARCH", "-DHAVE_XMB", + "-DHAVE_SHADERPIPELINE", "-D_LZMA_UINT32_IS_ULONG", "-DHAVE_MFI", "-DHAVE_BTSTACK", @@ -677,6 +679,7 @@ "-DHAVE_MATERIALUI", "-DHAVE_ZARCH", "-DHAVE_XMB", + "-DHAVE_SHADERPIPELINE", "-D_LZMA_UINT32_IS_ULONG", "-DHAVE_MFI", "-DHAVE_BTSTACK", @@ -753,6 +756,7 @@ "-DHAVE_MATERIALUI", "-DHAVE_ZARCH", "-DHAVE_XMB", + "-DHAVE_SHADERPIPELINE", "-D_LZMA_UINT32_IS_ULONG", ); PRODUCT_NAME = "RetroArch copy"; @@ -825,6 +829,7 @@ "-DHAVE_MATERIALUI", "-DHAVE_ZARCH", "-DHAVE_XMB", + "-DHAVE_SHADERPIPELINE", "-D_LZMA_UINT32_IS_ULONG", ); "OTHER_CFLAGS[arch=*]" = ( @@ -869,6 +874,7 @@ "-DHAVE_MATERIALUI", "-DHAVE_ZARCH", "-DHAVE_XMB", + "-DHAVE_SHADERPIPELINE", "-D_LZMA_UINT32_IS_ULONG", ); PRODUCT_NAME = "RetroArch copy"; @@ -1077,6 +1083,7 @@ "-DHAVE_MATERIALUI", "-DHAVE_ZARCH", "-DHAVE_XMB", + "-DHAVE_SHADERPIPELINE", "-D_LZMA_UINT32_IS_ULONG", "-DHAVE_MFI", "-DHAVE_BTSTACK", @@ -1153,6 +1160,7 @@ "-DHAVE_MATERIALUI", "-DHAVE_ZARCH", "-DHAVE_XMB", + "-DHAVE_SHADERPIPELINE", "-D_LZMA_UINT32_IS_ULONG", "-DHAVE_MFI", "-DHAVE_BTSTACK", @@ -1200,6 +1208,7 @@ "-DHAVE_MATERIALUI", "-DHAVE_ZARCH", "-DHAVE_XMB", + "-DHAVE_SHADERPIPELINE", "-D_LZMA_UINT32_IS_ULONG", "-DHAVE_MFI", "-DHAVE_BTSTACK", diff --git a/pkg/msvc/msvc-2010/RetroArch-msvc2010.vcxproj b/pkg/msvc/msvc-2010/RetroArch-msvc2010.vcxproj index de7960f13c..3b451c8ea1 100644 --- a/pkg/msvc/msvc-2010/RetroArch-msvc2010.vcxproj +++ b/pkg/msvc/msvc-2010/RetroArch-msvc2010.vcxproj @@ -100,7 +100,7 @@ Level3 Disabled - WIN32;RARCH_INTERNAL;HAVE_D3D;HAVE_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_XMB;WANT_ZLIB;HAVE_GRIFFIN;HAVE_FBO;HAVE_XMB;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT + WIN32;RARCH_INTERNAL;HAVE_D3D;HAVE_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_GRIFFIN;HAVE_FBO;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\gfx\inc;%(AdditionalIncludeDirectories) MultiThreadedDebug CompileAsCpp @@ -120,7 +120,7 @@ Level3 Disabled - WIN32;RARCH_INTERNAL;HAVE_D3D;HAVE_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;WANT_ZLIB;HAVE_FBO;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT + WIN32;RARCH_INTERNAL;HAVE_D3D;HAVE_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_FBO;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\gfx\inc;%(AdditionalIncludeDirectories) MultiThreadedDebug CompileAsCpp @@ -142,7 +142,7 @@ MaxSpeed true true - WIN32;RARCH_INTERNAL;HAVE_D3D;HAVE_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;WANT_ZLIB;HAVE_GRIFFIN;HAVE_FBO;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_XMB;WANT_ZLIB;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_MENU;HAVE_RGUI;HAVE_GL_SYNC;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT + WIN32;RARCH_INTERNAL;HAVE_D3D;HAVE_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_GRIFFIN;HAVE_FBO;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;WANT_ZLIB;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_MENU;HAVE_RGUI;HAVE_GL_SYNC;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\gfx\inc;%(AdditionalIncludeDirectories) MultiThreaded CompileAsCpp @@ -167,7 +167,7 @@ MaxSpeed true true - WIN32;RARCH_INTERNAL;HAVE_D3D;HAVE_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;WANT_ZLIB;HAVE_FBO;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;WANT_ZLIB;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT + WIN32;RARCH_INTERNAL;HAVE_D3D;HAVE_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_FBO;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;WANT_ZLIB;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\gfx\inc;%(AdditionalIncludeDirectories) MultiThreaded CompileAsCpp diff --git a/pkg/qnx/bb10/.cproject b/pkg/qnx/bb10/.cproject index 022d7b281a..eea6f5db12 100644 --- a/pkg/qnx/bb10/.cproject +++ b/pkg/qnx/bb10/.cproject @@ -39,6 +39,7 @@ + @@ -170,6 +171,7 @@ + @@ -303,6 +305,7 @@ + @@ -437,6 +440,7 @@ + @@ -569,6 +573,7 @@ + @@ -701,6 +706,7 @@ + @@ -834,6 +840,7 @@ + diff --git a/qb/config.params.sh b/qb/config.params.sh index 9ea4c4e78a..30baa6a491 100644 --- a/qb/config.params.sh +++ b/qb/config.params.sh @@ -74,6 +74,7 @@ HAVE_MMAP=auto # MMAP support HAVE_QT=no # QT companion support HAVE_XSHM=no # XShm video driver support (disabled because it's just a dummied out stub) HAVE_CHEEVOS=yes # Retro Achievements +HAVE_SHADERPIPELINE=yes # Additional shader-based pipelines HAVE_VULKAN=auto # Vulkan support C89_VULKAN=no HAVE_RPNG=yes # RPNG support