ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11239 from Tilka/ogl 

OGL: fix compute shader labels
This commit is contained in:
JMC47 2022-11-01 02:18:37 -04:00 committed by GitHub
parent 12b204d92a 22eb7e6645
commit 5488d3b125
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/VideoBackends/OGL/OGLShader.cpp
View File

@ -33,7 +33,7 @@ OGLShader::OGLShader(ShaderStage stage, GLenum gl_type, GLuint gl_id, std::strin
{
if (!m_name.empty() && g_ActiveConfig.backend_info.bSupportsSettingObjectNames)
{
glObjectLabel(GL_SHADER, m_gl_id, -1, m_name.c_str());
glObjectLabel(GL_SHADER, m_gl_id, (GLsizei)m_name.size(), m_name.c_str());
}
}
@ -44,7 +44,7 @@ OGLShader::OGLShader(GLuint gl_compute_program_id, std::string source, std::stri
{
if (!m_name.empty() && g_ActiveConfig.backend_info.bSupportsSettingObjectNames)
{
glObjectLabel(GL_SHADER, m_gl_compute_program_id, -1, m_name.c_str());
glObjectLabel(GL_PROGRAM, m_gl_compute_program_id, (GLsizei)m_name.size(), m_name.c_str());
}
}

2
Source/Core/VideoBackends/OGL/OGLTexture.cpp
View File

@ -120,7 +120,7 @@ OGLTexture::OGLTexture(const TextureConfig& tex_config, std::string_view name)
if (!m_name.empty() && g_ActiveConfig.backend_info.bSupportsSettingObjectNames)
{
glObjectLabel(GL_TEXTURE, m_texId, -1, m_name.c_str());
glObjectLabel(GL_TEXTURE, m_texId, (GLsizei)m_name.size(), m_name.c_str());
}
glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, m_config.levels - 1);