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 #6780 from stenzek/ogl-vs 

OGL: Fix broken format changes in i965 driver
This commit is contained in:
Markus Wick 2018-05-07 16:38:47 +02:00 committed by GitHub
parent e31c571f51 501b35bbf2
commit a7cc1044fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/VideoBackends/OGL/FramebufferManager.cpp
View File

@ -25,13 +25,9 @@
#include "VideoCommon/VideoBackendBase.h" #include "VideoCommon/VideoBackendBase.h"
constexpr const char* GLSL_REINTERPRET_PIXELFMT_VS = R"GLSL( constexpr const char* GLSL_REINTERPRET_PIXELFMT_VS = R"GLSL(
#define MULTILAYER %d
flat out int layer; flat out int layer;
void main(void) { void main(void) {
#if MULTILAYER
layer = 0; layer = 0;
#endif
vec2 rawpos = vec2(gl_VertexID & 1, gl_VertexID & 2); vec2 rawpos = vec2(gl_VertexID & 1, gl_VertexID & 2);
gl_Position = vec4(rawpos* 2.0 - 1.0, 0.0, 1.0); gl_Position = vec4(rawpos* 2.0 - 1.0, 0.0, 1.0);
})GLSL"; })GLSL";
@ -356,7 +352,7 @@ FramebufferManager::FramebufferManager(int targetWidth, int targetHeight, int ms
} }
// reinterpret pixel format // reinterpret pixel format
std::string vs = StringFromFormat(GLSL_REINTERPRET_PIXELFMT_VS, multilayer); std::string vs = GLSL_REINTERPRET_PIXELFMT_VS;
// The way to sample the EFB is based on the on the current configuration. // The way to sample the EFB is based on the on the current configuration.
// As we use the same sampling way for both interpreting shaders, the sampling // As we use the same sampling way for both interpreting shaders, the sampling