Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-04-07 22:55:40 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

fix merge conflict bug

Browse source
This commit is contained in:
wheremyfoodat 2024-10-19 16:31:56 +03:00 • committed by GitHub
parent a681977c52
commit bdf54290de
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/core/PICA/shader_gen_glsl.cpp
View file

@ -811,6 +811,7 @@ void main() {
})"; })";
return ret; return ret;
} }
}
void FragmentGenerator::compileLogicOps(std::string& shader, const PICA::FragmentConfig& config) { void FragmentGenerator::compileLogicOps(std::string& shader, const PICA::FragmentConfig& config) {
if (api != API::GLES) [[unlikely]] { if (api != API::GLES) [[unlikely]] {