mirror of
https://github.com/libretro/RetroArch
synced 2025-02-16 12:39:59 +00:00
(D3D10) Add non_HAVE_DYNAMIC codepaths
This commit is contained in:
parent
03e800c1c8
commit
2906744a0d
@ -42,6 +42,7 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain(
|
||||
{
|
||||
static PFN_D3D10_CREATE_DEVICE_AND_SWAP_CHAIN fp;
|
||||
|
||||
#ifdef HAVE_DYNAMIC
|
||||
if (!d3d10_dll)
|
||||
d3d10_dll = dylib_load("d3d10.dll");
|
||||
|
||||
@ -51,6 +52,9 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain(
|
||||
if (!fp)
|
||||
fp = (PFN_D3D10_CREATE_DEVICE_AND_SWAP_CHAIN)dylib_proc(
|
||||
d3d10_dll, "D3D10CreateDeviceAndSwapChain");
|
||||
#else
|
||||
fp = D3D10CreateDeviceAndSwapChain;
|
||||
#endif
|
||||
|
||||
if (!fp)
|
||||
return TYPE_E_CANTLOADLIBRARY;
|
||||
@ -78,12 +82,12 @@ void d3d10_init_texture(D3D10Device device, d3d10_texture_t* texture)
|
||||
D3D10CreateTexture2D(device, &texture->desc, NULL, &texture->handle);
|
||||
|
||||
{
|
||||
D3D10_SHADER_RESOURCE_VIEW_DESC view_desc = {
|
||||
.Format = texture->desc.Format,
|
||||
.ViewDimension = D3D_SRV_DIMENSION_TEXTURE2D,
|
||||
.Texture2D.MostDetailedMip = 0,
|
||||
.Texture2D.MipLevels = -1,
|
||||
};
|
||||
D3D10_SHADER_RESOURCE_VIEW_DESC view_desc = { 0 };
|
||||
view_desc.Format = texture->desc.Format;
|
||||
view_desc.ViewDimension = D3D_SRV_DIMENSION_TEXTURE2D;
|
||||
view_desc.Texture2D.MostDetailedMip = 0;
|
||||
view_desc.Texture2D.MipLevels = -1;
|
||||
|
||||
D3D10CreateTexture2DShaderResourceView(device, texture->handle, &view_desc, &texture->view);
|
||||
}
|
||||
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -16,14 +16,14 @@
|
||||
#include <assert.h>
|
||||
#include <string/stdstring.h>
|
||||
|
||||
#include "driver.h"
|
||||
#include "verbosity.h"
|
||||
#include "configuration.h"
|
||||
#include "gfx/video_driver.h"
|
||||
#include "gfx/common/win32_common.h"
|
||||
#include "gfx/common/d3d10_common.h"
|
||||
#include "gfx/common/dxgi_common.h"
|
||||
#include "gfx/common/d3dcompiler_common.h"
|
||||
#include "../../driver.h"
|
||||
#include "../../verbosity.h"
|
||||
#include "../../configuration.h"
|
||||
#include "../video_driver.h"
|
||||
#include "../common/win32_common.h"
|
||||
#include "../common/d3d10_common.h"
|
||||
#include "../common/dxgi_common.h"
|
||||
#include "../common/d3dcompiler_common.h"
|
||||
|
||||
static void d3d10_set_filtering(void* data, unsigned index, bool smooth)
|
||||
{
|
||||
|
@ -114,7 +114,7 @@
|
||||
<Optimization>MaxSpeed</Optimization>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
<PreprocessorDefinitions>WIN32;HAVE_MENU;HAVE_XMB;HAVE_RGUI;HAVE_MATERIALUI;NDEBUG;_WINDOWS;HAVE_XAUDIO;HAVE_DSOUND;HAVE_DINPUT;HAVE_D3D;HAVE_D3D9;HAVE_D3D11;HAVE_OPENGL;HAVE_GLSL;HAVE_THREADS;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_GRIFFIN;HAVE_RJPEG;HAVE_RPNG;HAVE_ZLIB;WANT_ZLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_OVERLAY;HAVE_7ZIP;HAVE_LIBRETRODB;HAVE_STB_FONT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>WIN32;HAVE_MENU;HAVE_XMB;HAVE_RGUI;HAVE_MATERIALUI;NDEBUG;_WINDOWS;HAVE_XAUDIO;HAVE_DSOUND;HAVE_DINPUT;HAVE_D3D;HAVE_D3D10;HAVE_D3D9;HAVE_D3D11;HAVE_OPENGL;HAVE_GLSL;HAVE_THREADS;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_GRIFFIN;HAVE_RJPEG;HAVE_RPNG;HAVE_ZLIB;WANT_ZLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_OVERLAY;HAVE_7ZIP;HAVE_LIBRETRODB;HAVE_STB_FONT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<AdditionalIncludeDirectories>$(SolutionDir)\..\..\gfx\include\dxsdk;$(SolutionDir)\..\..\gfx\include;$(SolutionDir)\..\..\libretro-common\include;$(SolutionDir)\..\..\deps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
|
Loading…
x
Reference in New Issue
Block a user