TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-28 15:53:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

glgsg: Don't use simple RAM image in shaders for non-sampler2D types

Browse Source 
Simple RAM images are always 2D right now, so this would otherwise cause an error.
This commit is contained in:
rdb 2021-11-28 13:59:21 +01:00
parent 8f9d23ff29
commit 5cad0eb973
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
panda/src/glstuff/glShaderContext_src.cxx
View File

@ -2952,10 +2952,13 @@ update_shader_texture_bindings(ShaderContext *prev) {
// Bindless texturing wasn't supported or didn't work, so let's just bind // Bindless texturing wasn't supported or didn't work, so let's just bind
// the texture normally. // the texture normally.
// Note that simple RAM images are always 2-D for now, so to avoid errors,
// we must load the real texture if this is not for a sampler2D.
bool force = (spec._desired_type != Texture::TT_2d_texture);
#ifndef OPENGLES #ifndef OPENGLES
if (multi_bind) { if (multi_bind) {
// Multi-bind case. // Multi-bind case.
if (!_glgsg->update_texture(gtc, false)) { if (!_glgsg->update_texture(gtc, force)) {
textures[i] = 0; textures[i] = 0;
} else { } else {
gtc->set_active(true); gtc->set_active(true);
@ -2975,7 +2978,7 @@ update_shader_texture_bindings(ShaderContext *prev) {
{ {
// Non-multibind case. // Non-multibind case.
_glgsg->set_active_texture_stage(i); _glgsg->set_active_texture_stage(i);
if (!_glgsg->update_texture(gtc, false)) { if (!_glgsg->update_texture(gtc, force)) {
continue; continue;
} }
_glgsg->apply_texture(gtc); _glgsg->apply_texture(gtc);