sneedmca/Lime3DS
1
0
Fork 0
mirror of https://github.com/Lime3DS/Lime3DS synced 2024-12-28 01:52:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3898 from wwylele/shut-up-texture5

Browse source 
swrasterizer, gl_shader_gen: return 0.0 for Disabled texture unit 0
This commit is contained in:
Weiyi Wang 2018-07-07 18:45:13 +03:00 committed by GitHub
commit 7c7adc64fd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/video_core/renderer_opengl/gl_shader_gen.cpp
View file

@ -319,6 +319,8 @@ static std::string SampleTexture(const PicaFSConfig& config, unsigned texture_un
return "shadowTexture(texcoord0, texcoord0_w)"; return "shadowTexture(texcoord0, texcoord0_w)";
case TexturingRegs::TextureConfig::ShadowCube: case TexturingRegs::TextureConfig::ShadowCube:
return "shadowTextureCube(texcoord0, texcoord0_w)"; return "shadowTextureCube(texcoord0, texcoord0_w)";
case TexturingRegs::TextureConfig::Disabled:
return "vec4(0.0)";
default: default:
LOG_CRITICAL(HW_GPU, "Unhandled texture type {:x}", LOG_CRITICAL(HW_GPU, "Unhandled texture type {:x}",
static_cast<int>(state.texture0_type)); static_cast<int>(state.texture0_type));

5
src/video_core/swrasterizer/rasterizer.cpp
View file

@ -361,9 +361,10 @@ static void ProcessTriangleInternal(const Vertex& v0, const Vertex& v1, const Ve
shadow_z = float24::FromFloat32(std::abs(tc0_w.ToFloat32())); shadow_z = float24::FromFloat32(std::abs(tc0_w.ToFloat32()));
break; break;
} }
case TexturingRegs::TextureConfig::Disabled:
continue; // skip this unit and continue to the next unit
default: default:
// TODO: Change to LOG_ERROR when more types are handled. LOG_ERROR(HW_GPU, "Unhandled texture type {:x}", (int)texture.config.type);
LOG_DEBUG(HW_GPU, "Unhandled texture type {:x}", (int)texture.config.type);
UNIMPLEMENTED(); UNIMPLEMENTED();
break; break;
} }