ShuriZma
/
xenia
mirror of https://github.com/xenia-project/xenia.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #533 from sephiroth99/noamd 

More shader changes
This commit is contained in:
Ben Vanik 2016-02-16 07:18:55 -08:00
parent 043e5699ac 00674736fe
commit cc00b2d7a5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/xenia/gpu/glsl_shader_translator.cc
View File

@ -179,7 +179,7 @@ vec4 cube(vec4 src0, vec4 src1) {
float s = (sc / ma + 1.0) / 2.0; float s = (sc / ma + 1.0) / 2.0;
float t = (tc / ma + 1.0) / 2.0; float t = (tc / ma + 1.0) / 2.0;
return vec4(t, s, 2.0 * ma, float(face_id)); return vec4(t, s, 2.0 * ma, float(face_id));
}; }
)"); )");
if (is_vertex_shader()) { if (is_vertex_shader()) {
@ -234,7 +234,7 @@ vec4 applyTransform(const in StateData state, vec4 pos) {
pos.xyz = mix(pos.xyz, pos.xyz / pos.w, notEqual(state.vtx_fmt.xyz, vec3(0.0))); pos.xyz = mix(pos.xyz, pos.xyz / pos.w, notEqual(state.vtx_fmt.xyz, vec3(0.0)));
pos.xy *= state.window_scale.xy; pos.xy *= state.window_scale.xy;
return pos; return pos;
}; }
void processVertex(const in StateData state); void processVertex(const in StateData state);
void main() { void main() {
gl_Position = vec4(0.0, 0.0, 0.0, 1.0); gl_Position = vec4(0.0, 0.0, 0.0, 1.0);

4
src/xenia/ui/gl/gl_context.cc
View File

@ -287,8 +287,8 @@ void GLContext::AssertExtensionsPresent() {
reinterpret_cast<const char*>(glGetString(GL_SHADING_LANGUAGE_VERSION)); reinterpret_cast<const char*>(glGetString(GL_SHADING_LANGUAGE_VERSION));
std::string glsl_version(glsl_version_raw); std::string glsl_version(glsl_version_raw);
if (glsl_version.find("4.50") != 0) { if (glsl_version.find("4.50") != 0) {
XELOGW("GLSL version reported as %s; you may have a bad time!", FatalGLError("OpenGL GLSL version 4.50 is required.");
glsl_version_raw); return;
} }
if (!GLEW_ARB_bindless_texture || !glMakeTextureHandleResidentARB) { if (!GLEW_ARB_bindless_texture || !glMakeTextureHandleResidentARB) {