diff --git a/doc/ReleaseNotes b/doc/ReleaseNotes index a9322f8518..5942c69e8c 100644 --- a/doc/ReleaseNotes +++ b/doc/ReleaseNotes @@ -13,6 +13,7 @@ This maintenance release fixes some minor defects and stability issues. * Egg: Add limited forward compatibility for metallic-roughness textures * OpenGL: fix error blitting depth texture on macOS (#1719) * OpenGL: fix SSBO support not being detected in certain situations +* GLSL: Add p3d_MetallicRoughnessTexture input mapped to M_metallic_roughness * X11: Add config variable to enable detection of autorepeat key events (#1735) * GUI: Fix bug with PGSliderBar dragging (#1722) * Minor thread safety things for free-threaded Python builds diff --git a/panda/src/glstuff/glShaderContext_src.cxx b/panda/src/glstuff/glShaderContext_src.cxx index 1de385095f..6a65fb1f8d 100644 --- a/panda/src/glstuff/glShaderContext_src.cxx +++ b/panda/src/glstuff/glShaderContext_src.cxx @@ -1015,7 +1015,8 @@ reflect_uniform(int i, char *name_buffer, GLsizei name_buflen) { else if (noprefix.compare(7, string::npos, "Height") == 0) { bind._part = Shader::STO_stage_height_i; } - else if (noprefix.compare(7, string::npos, "Selector") == 0) { + else if (noprefix.compare(7, string::npos, "MetallicRoughness") == 0 || + noprefix.compare(7, string::npos, "Selector") == 0) { bind._part = Shader::STO_stage_selector_i; } else if (noprefix.compare(7, string::npos, "Gloss") == 0) { diff --git a/panda/src/gobj/textureStage.h b/panda/src/gobj/textureStage.h index ebbd1ab1a2..ce15745457 100644 --- a/panda/src/gobj/textureStage.h +++ b/panda/src/gobj/textureStage.h @@ -65,6 +65,9 @@ PUBLISHED: M_normal_gloss, M_emission, + + // Forward compatibility alias. + M_metallic_roughness = M_selector, }; enum CombineMode {