mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-24 23:11:14 +01:00
VideoCommon: Skip textureQueryLevels if it doesn't exist
This commit is contained in:
parent
bdcfb31187
commit
1adff1c467
@ -107,6 +107,7 @@ void VideoBackend::FillBackendInfo()
|
|||||||
g_Config.backend_info.bSupportsShaderBinaries = true;
|
g_Config.backend_info.bSupportsShaderBinaries = true;
|
||||||
g_Config.backend_info.bSupportsPipelineCacheData = false;
|
g_Config.backend_info.bSupportsPipelineCacheData = false;
|
||||||
g_Config.backend_info.bSupportsCoarseDerivatives = true;
|
g_Config.backend_info.bSupportsCoarseDerivatives = true;
|
||||||
|
g_Config.backend_info.bSupportsTextureQueryLevels = true;
|
||||||
g_Config.backend_info.bSupportsLogicOp = D3D::SupportsLogicOp(g_Config.iAdapter);
|
g_Config.backend_info.bSupportsLogicOp = D3D::SupportsLogicOp(g_Config.iAdapter);
|
||||||
|
|
||||||
g_Config.backend_info.Adapters = D3DCommon::GetAdapterNames();
|
g_Config.backend_info.Adapters = D3DCommon::GetAdapterNames();
|
||||||
|
@ -83,6 +83,7 @@ void VideoBackend::FillBackendInfo()
|
|||||||
g_Config.backend_info.bSupportsShaderBinaries = true;
|
g_Config.backend_info.bSupportsShaderBinaries = true;
|
||||||
g_Config.backend_info.bSupportsPipelineCacheData = true;
|
g_Config.backend_info.bSupportsPipelineCacheData = true;
|
||||||
g_Config.backend_info.bSupportsCoarseDerivatives = true;
|
g_Config.backend_info.bSupportsCoarseDerivatives = true;
|
||||||
|
g_Config.backend_info.bSupportsTextureQueryLevels = true;
|
||||||
|
|
||||||
// We can only check texture support once we have a device.
|
// We can only check texture support once we have a device.
|
||||||
if (g_dx_context)
|
if (g_dx_context)
|
||||||
|
@ -56,6 +56,7 @@ void VideoBackend::InitBackendInfo()
|
|||||||
g_Config.backend_info.bSupportsShaderBinaries = false;
|
g_Config.backend_info.bSupportsShaderBinaries = false;
|
||||||
g_Config.backend_info.bSupportsPipelineCacheData = false;
|
g_Config.backend_info.bSupportsPipelineCacheData = false;
|
||||||
g_Config.backend_info.bSupportsCoarseDerivatives = false;
|
g_Config.backend_info.bSupportsCoarseDerivatives = false;
|
||||||
|
g_Config.backend_info.bSupportsTextureQueryLevels = false;
|
||||||
|
|
||||||
// aamodes: We only support 1 sample, so no MSAA
|
// aamodes: We only support 1 sample, so no MSAA
|
||||||
g_Config.backend_info.Adapters.clear();
|
g_Config.backend_info.Adapters.clear();
|
||||||
|
@ -108,6 +108,7 @@ void VideoBackend::InitBackendInfo()
|
|||||||
g_Config.backend_info.bSupportsST3CTextures = false;
|
g_Config.backend_info.bSupportsST3CTextures = false;
|
||||||
g_Config.backend_info.bSupportsBPTCTextures = false;
|
g_Config.backend_info.bSupportsBPTCTextures = false;
|
||||||
g_Config.backend_info.bSupportsCoarseDerivatives = false;
|
g_Config.backend_info.bSupportsCoarseDerivatives = false;
|
||||||
|
g_Config.backend_info.bSupportsTextureQueryLevels = false;
|
||||||
|
|
||||||
g_Config.backend_info.Adapters.clear();
|
g_Config.backend_info.Adapters.clear();
|
||||||
|
|
||||||
|
@ -485,6 +485,8 @@ Renderer::Renderer(std::unique_ptr<GLContext> main_gl_context, float backbuffer_
|
|||||||
GLExtensions::Supports("GL_ARB_texture_compression_bptc");
|
GLExtensions::Supports("GL_ARB_texture_compression_bptc");
|
||||||
g_Config.backend_info.bSupportsCoarseDerivatives =
|
g_Config.backend_info.bSupportsCoarseDerivatives =
|
||||||
GLExtensions::Supports("GL_ARB_derivative_control") || GLExtensions::Version() >= 450;
|
GLExtensions::Supports("GL_ARB_derivative_control") || GLExtensions::Version() >= 450;
|
||||||
|
g_Config.backend_info.bSupportsTextureQueryLevels =
|
||||||
|
GLExtensions::Supports("GL_ARB_texture_query_levels") || GLExtensions::Version() >= 430;
|
||||||
|
|
||||||
if (m_main_gl_context->IsGLES())
|
if (m_main_gl_context->IsGLES())
|
||||||
{
|
{
|
||||||
|
@ -748,6 +748,7 @@ void ProgramShaderCache::CreateHeader()
|
|||||||
"%s\n" // shader framebuffer fetch
|
"%s\n" // shader framebuffer fetch
|
||||||
"%s\n" // shader thread shuffle
|
"%s\n" // shader thread shuffle
|
||||||
"%s\n" // derivative control
|
"%s\n" // derivative control
|
||||||
|
"%s\n" // query levels
|
||||||
|
|
||||||
// Precision defines for GLSL ES
|
// Precision defines for GLSL ES
|
||||||
"%s\n"
|
"%s\n"
|
||||||
@ -830,6 +831,9 @@ void ProgramShaderCache::CreateHeader()
|
|||||||
g_ActiveConfig.backend_info.bSupportsCoarseDerivatives ?
|
g_ActiveConfig.backend_info.bSupportsCoarseDerivatives ?
|
||||||
"#extension GL_ARB_derivative_control : enable" :
|
"#extension GL_ARB_derivative_control : enable" :
|
||||||
"",
|
"",
|
||||||
|
g_ActiveConfig.backend_info.bSupportsTextureQueryLevels ?
|
||||||
|
"#extension GL_ARB_texture_query_levels : enable" :
|
||||||
|
"",
|
||||||
is_glsles ? "precision highp float;" : "", is_glsles ? "precision highp int;" : "",
|
is_glsles ? "precision highp float;" : "", is_glsles ? "precision highp int;" : "",
|
||||||
is_glsles ? "precision highp sampler2DArray;" : "",
|
is_glsles ? "precision highp sampler2DArray;" : "",
|
||||||
(is_glsles && g_ActiveConfig.backend_info.bSupportsPaletteConversion) ?
|
(is_glsles && g_ActiveConfig.backend_info.bSupportsPaletteConversion) ?
|
||||||
|
@ -85,6 +85,7 @@ void VideoSoftware::InitBackendInfo()
|
|||||||
g_Config.backend_info.bSupportsPipelineCacheData = false;
|
g_Config.backend_info.bSupportsPipelineCacheData = false;
|
||||||
g_Config.backend_info.bSupportsBBox = true;
|
g_Config.backend_info.bSupportsBBox = true;
|
||||||
g_Config.backend_info.bSupportsCoarseDerivatives = false;
|
g_Config.backend_info.bSupportsCoarseDerivatives = false;
|
||||||
|
g_Config.backend_info.bSupportsTextureQueryLevels = false;
|
||||||
|
|
||||||
// aamodes
|
// aamodes
|
||||||
g_Config.backend_info.AAModes = {1};
|
g_Config.backend_info.AAModes = {1};
|
||||||
|
@ -287,6 +287,7 @@ void VulkanContext::PopulateBackendInfo(VideoConfig* config)
|
|||||||
config->backend_info.bSupportsLargePoints = false; // Dependent on features.
|
config->backend_info.bSupportsLargePoints = false; // Dependent on features.
|
||||||
config->backend_info.bSupportsFramebufferFetch = false; // No support.
|
config->backend_info.bSupportsFramebufferFetch = false; // No support.
|
||||||
config->backend_info.bSupportsCoarseDerivatives = true; // Assumed support.
|
config->backend_info.bSupportsCoarseDerivatives = true; // Assumed support.
|
||||||
|
config->backend_info.bSupportsTextureQueryLevels = true; // Assumed support.
|
||||||
}
|
}
|
||||||
|
|
||||||
void VulkanContext::PopulateBackendInfoAdapters(VideoConfig* config, const GPUList& gpu_list)
|
void VulkanContext::PopulateBackendInfoAdapters(VideoConfig* config, const GPUList& gpu_list)
|
||||||
|
@ -692,11 +692,21 @@ uint WrapCoord(int coord, uint wrap, int size) {{
|
|||||||
int3 size = textureSize(tex, 0);
|
int3 size = textureSize(tex, 0);
|
||||||
int size_s = size.x;
|
int size_s = size.x;
|
||||||
int size_t = size.y;
|
int size_t = size.y;
|
||||||
int number_of_levels = textureQueryLevels(tex);
|
|
||||||
)");
|
)");
|
||||||
|
if (g_ActiveConfig.backend_info.bSupportsTextureQueryLevels)
|
||||||
|
{
|
||||||
|
out.Write(" int number_of_levels = textureQueryLevels(tex);\n");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
out.Write(" int number_of_levels = 256; // textureQueryLevels is not supported\n");
|
||||||
|
ERROR_LOG_FMT(VIDEO, "textureQueryLevels is not supported! Odd graphical results may "
|
||||||
|
"occur if custom textures are in use!");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else if (api_type == APIType::D3D)
|
else if (api_type == APIType::D3D)
|
||||||
{
|
{
|
||||||
|
ASSERT(g_ActiveConfig.backend_info.bSupportsTextureQueryLevels);
|
||||||
out.Write(R"(
|
out.Write(R"(
|
||||||
int size_s, size_t, layers, number_of_levels;
|
int size_s, size_t, layers, number_of_levels;
|
||||||
tex.GetDimensions(0, size_s, size_t, layers, number_of_levels);
|
tex.GetDimensions(0, size_s, size_t, layers, number_of_levels);
|
||||||
|
@ -232,6 +232,7 @@ struct VideoConfig final
|
|||||||
bool bSupportsShaderBinaries = false;
|
bool bSupportsShaderBinaries = false;
|
||||||
bool bSupportsPipelineCacheData = false;
|
bool bSupportsPipelineCacheData = false;
|
||||||
bool bSupportsCoarseDerivatives = false;
|
bool bSupportsCoarseDerivatives = false;
|
||||||
|
bool bSupportsTextureQueryLevels = false;
|
||||||
} backend_info;
|
} backend_info;
|
||||||
|
|
||||||
// Utility
|
// Utility
|
||||||
|
Loading…
x
Reference in New Issue
Block a user