Permalink
Browse files

Merge pull request #11515 from libretro/master

Libretro Updates
  • Loading branch information...
hrydgard committed Nov 2, 2018
2 parents fdefddd + d9198ff commit 951a288bf41efde587188e2c6dbb1307fc974592
Showing with 17 additions and 4 deletions.
  1. +1 −0 Common/OSVersion.cpp
  2. +4 −1 libretro/LibretroD3D11Context.cpp
  3. +2 −2 libretro/Makefile
  4. +4 −1 libretro/Makefile.common
  5. +6 −0 libretro/libretro.cpp
View
@@ -7,6 +7,7 @@
#endif
#include <cstdint>
#include <vector>
#include "OSVersion.h"
#include "Common/CommonWindows.h"
@@ -1,4 +1,5 @@
#include "Core/ConfigValues.h"
#include "libretro/LibretroD3D11Context.h"
#include "thin3d/d3d11_loader.h"
#include <d3d11_1.h>
@@ -17,6 +18,8 @@ bool LibretroD3D11Context::Init() {
}
void LibretroD3D11Context::CreateDrawContext() {
std::vector<std::string> adapterNames;
if (!Libretro::environ_cb(RETRO_ENVIRONMENT_GET_HW_RENDER_INTERFACE, (void **)&d3d11_) || !d3d11_) {
ERROR_LOG(G3D, "Failed to get HW rendering interface!\n");
return;
@@ -35,7 +38,7 @@ void LibretroD3D11Context::CreateDrawContext() {
ID3D11DeviceContext1 *context1 = nullptr;
d3d11_->context->QueryInterface(__uuidof(ID3D11DeviceContext1), (void **)&context1);
draw_ = Draw::T3DCreateD3D11Context(d3d11_->device, d3d11_->context, device1, context1, d3d11_->featureLevel, NULL);
draw_ = Draw::T3DCreateD3D11Context(d3d11_->device, d3d11_->context, device1, context1, d3d11_->featureLevel, NULL, adapterNames);
}
void LibretroD3D11Context::DestroyDrawContext() {
View
@@ -15,9 +15,9 @@ ifeq (,$(TARGET_ARCH))
endif
ifneq (,$(findstring 64,$(TARGET_ARCH)))
override TARGET_ARCH := x86_64
TARGET_ARCH := x86_64
else ifneq (,$(findstring 86,$(TARGET_ARCH)))
override TARGET_ARCH := x86
TARGET_ARCH := x86
endif
ifeq ($(platform),)
View
@@ -216,6 +216,7 @@ SOURCES_CXX += \
$(EXTDIR)/glslang/glslang/MachineIndependent/preprocessor/PpContext.cpp \
$(EXTDIR)/glslang/glslang/MachineIndependent/preprocessor/PpScanner.cpp \
$(EXTDIR)/glslang/glslang/MachineIndependent/preprocessor/PpTokens.cpp \
$(EXTDIR)/glslang/glslang/MachineIndependent/attribute.cpp \
$(EXTDIR)/glslang/glslang/MachineIndependent/Constant.cpp \
$(EXTDIR)/glslang/glslang/MachineIndependent/InfoSink.cpp \
$(EXTDIR)/glslang/glslang/MachineIndependent/Initialize.cpp \
@@ -409,6 +410,7 @@ SOURCES_CXX += $(NATIVEDIR)/math/dataconv.cpp \
$(COREDIR)/HLE/sceSsl.cpp \
$(COREDIR)/HLE/sceUmd.cpp \
$(COREDIR)/HLE/sceUsb.cpp \
$(COREDIR)/HLE/sceUsbAcc.cpp \
$(COREDIR)/HLE/sceUsbCam.cpp \
$(COREDIR)/HLE/sceUtility.cpp \
$(COREDIR)/HLE/sceVaudio.cpp \
@@ -454,6 +456,7 @@ SOURCES_CXX += $(NATIVEDIR)/math/dataconv.cpp \
$(COREDIR)/MemMap.cpp \
$(COREDIR)/MemMapFunctions.cpp \
$(COREDIR)/PSPLoaders.cpp \
$(COREDIR)/Replay.cpp \
$(COREDIR)/Reporting.cpp \
$(COREDIR)/SaveState.cpp \
$(COREDIR)/Screenshot.cpp \
@@ -675,7 +678,7 @@ SOURCES_C += \
endif
GIT_VERSION_SRC = $(CORE_DIR)/git-version.cpp
GIT_VERSION := $(shell git describe --always || echo v1.4.2-git)
GIT_VERSION := $(shell git describe --always || echo v1.7.0-git)
GIT_VERSION_NO_UPDATE = $(findstring 1,$(shell grep -s PPSSPP_GIT_VERSION_NO_UPDATE $(GIT_VERSION_SRC)))
ifneq (,$(findstring $(GIT_VERSION),$(shell grep -s char $(GIT_VERSION_SRC))))
GIT_VERSION_NO_UPDATE = 1
View
@@ -178,8 +178,10 @@ static RetroOption<bool> ppsspp_fast_memory("ppsspp_fast_memory", "Fast Memory (
static RetroOption<bool> ppsspp_block_transfer_gpu("ppsspp_block_transfer_gpu", "Block Transfer GPU", true);
static RetroOption<int> ppsspp_texture_scaling_level("ppsspp_texture_scaling_level", "Texture Scaling Level", { { "1", 1 }, { "2", 2 }, { "3", 3 }, { "4", 4 }, { "5", 5 }, { "0", 0 } });
static RetroOption<int> ppsspp_texture_scaling_type("ppsspp_texture_scaling_type", "Texture Scaling Type", { { "xbrz", TextureScalerCommon::XBRZ }, { "hybrid", TextureScalerCommon::HYBRID }, { "bicubic", TextureScalerCommon::BICUBIC }, { "hybrid_bicubic", TextureScalerCommon::HYBRID_BICUBIC } });
static RetroOption<int> ppsspp_texture_filtering("ppsspp_texture_filtering", "Texture Filtering", { { "auto", 1 }, { "nearest", 2 }, { "linear", 3 }, { "linear(FMV)", 4 } });
static RetroOption<int> ppsspp_texture_anisotropic_filtering("ppsspp_texture_anisotropic_filtering", "Anisotropic Filtering", { "off", "1x", "2x", "4x", "8x", "16x" });
static RetroOption<bool> ppsspp_texture_deposterize("ppsspp_texture_deposterize", "Texture Deposterize", false);
static RetroOption<bool> ppsspp_texture_replacement("ppsspp_texture_replacement", "Texture Replacement", false);
static RetroOption<bool> ppsspp_gpu_hardware_transform("ppsspp_gpu_hardware_transform", "GPU Hardware T&L", true);
static RetroOption<bool> ppsspp_vertex_cache("ppsspp_vertex_cache", "Vertex Cache (Speedhack)", true);
static RetroOption<bool> ppsspp_separate_io_thread("ppsspp_separate_io_thread", "IO Threading", false);
@@ -204,8 +206,10 @@ void retro_set_environment(retro_environment_t cb) {
vars.push_back(ppsspp_block_transfer_gpu.GetOptions());
vars.push_back(ppsspp_texture_scaling_level.GetOptions());
vars.push_back(ppsspp_texture_scaling_type.GetOptions());
vars.push_back(ppsspp_texture_filtering.GetOptions());
vars.push_back(ppsspp_texture_anisotropic_filtering.GetOptions());
vars.push_back(ppsspp_texture_deposterize.GetOptions());
vars.push_back(ppsspp_texture_replacement.GetOptions());
vars.push_back(ppsspp_gpu_hardware_transform.GetOptions());
vars.push_back(ppsspp_vertex_cache.GetOptions());
vars.push_back(ppsspp_separate_io_thread.GetOptions());
@@ -268,8 +272,10 @@ static void check_variables(CoreParameter &coreParam) {
ppsspp_true_color.Update(&g_Config.bTrueColor);
ppsspp_auto_frameskip.Update(&g_Config.bAutoFrameSkip);
ppsspp_block_transfer_gpu.Update(&g_Config.bBlockTransferGPU);
ppsspp_texture_filtering.Update(&g_Config.iTexFiltering);
ppsspp_texture_anisotropic_filtering.Update(&g_Config.iAnisotropyLevel);
ppsspp_texture_deposterize.Update(&g_Config.bTexDeposterize);
ppsspp_texture_replacement.Update(&g_Config.bReplaceTextures);
ppsspp_separate_io_thread.Update(&g_Config.bSeparateIOThread);
ppsspp_unsafe_func_replacements.Update(&g_Config.bFuncReplacements);
ppsspp_sound_speedhack.Update(&g_Config.bSoundSpeedHack);

0 comments on commit 951a288

Please sign in to comment.