1
0
mirror of https://github.com/EduApps-CDG/OpenDX synced 2024-12-30 09:45:37 +01:00

[dxvk] Create dummy sampler

This commit is contained in:
Philip Rebohle 2018-01-29 20:54:09 +01:00
parent 9fbddf57df
commit fb641a3dc8
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
3 changed files with 7 additions and 6 deletions

View File

@ -6,10 +6,10 @@ strip = '/usr/bin/i686-w64-mingw32-strip'
exe_wrapper = 'wine' exe_wrapper = 'wine'
[properties] [properties]
c_args = ['-Og', '-gstabs'] c_args = ['-Og', '-gdwarf-2']
c_link_args = ['-static', '-static-libgcc'] c_link_args = ['-static', '-static-libgcc']
cpp_args = ['-Og', '-gstabs'] cpp_args = ['-Og', '-gdwarf-2']
cpp_link_args = ['-static', '-static-libgcc', '-static-libstdc++', '-Wl,--add-stdcall-alias'] cpp_link_args = ['-static', '-static-libgcc', '-static-libstdc++', '-Wl,--add-stdcall-alias']
[host_machine] [host_machine]

View File

@ -6,10 +6,10 @@ strip = '/usr/bin/x86_64-w64-mingw32-strip'
exe_wrapper = 'wine' exe_wrapper = 'wine'
[properties] [properties]
c_args = ['-Og', '-gstabs'] c_args = ['-Og', '-gdwarf-2']
c_link_args = ['-static', '-static-libgcc'] c_link_args = ['-static', '-static-libgcc']
cpp_args = ['-Og', '-gstabs'] cpp_args = ['-Og', '-gdwarf-2']
cpp_link_args = ['-static', '-static-libgcc', '-static-libstdc++'] cpp_link_args = ['-static', '-static-libgcc', '-static-libstdc++']
[host_machine] [host_machine]

View File

@ -3,7 +3,8 @@
namespace dxvk { namespace dxvk {
DxvkUnboundResources::DxvkUnboundResources(DxvkDevice* dev) DxvkUnboundResources::DxvkUnboundResources(DxvkDevice* dev)
: m_buffer (createBuffer(dev)), : m_sampler (createSampler(dev)),
m_buffer (createBuffer(dev)),
m_bufferView (createBufferView(dev, m_buffer)), m_bufferView (createBufferView(dev, m_buffer)),
m_image1D (createImage(dev, VK_IMAGE_TYPE_1D, 1)), m_image1D (createImage(dev, VK_IMAGE_TYPE_1D, 1)),
m_image2D (createImage(dev, VK_IMAGE_TYPE_2D, 6)), m_image2D (createImage(dev, VK_IMAGE_TYPE_2D, 6)),
@ -142,7 +143,7 @@ namespace dxvk {
case VK_IMAGE_VIEW_TYPE_CUBE: return m_viewCube.ptr(); case VK_IMAGE_VIEW_TYPE_CUBE: return m_viewCube.ptr();
case VK_IMAGE_VIEW_TYPE_CUBE_ARRAY: return m_viewCubeArr.ptr(); case VK_IMAGE_VIEW_TYPE_CUBE_ARRAY: return m_viewCubeArr.ptr();
case VK_IMAGE_VIEW_TYPE_3D: return m_view3D.ptr(); case VK_IMAGE_VIEW_TYPE_3D: return m_view3D.ptr();
default: return nullptr; default: Logger::err("null"); return nullptr;
} }
} }