AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Vulkan Updates

This commit is contained in:
Jack Andersen 2016-07-01 17:46:02 -10:00
parent 8e43027b1d
commit 2e784a1941
5 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Runtime/Graphics/CLineRendererShadersGLSL.cpp
View File

@ -27,7 +27,7 @@ BOO_GLSL_BINDING_HEAD
"{\n" "{\n"
" vtf.color = colorIn * moduColor;\n" " vtf.color = colorIn * moduColor;\n"
" vtf.uv = uvIn.xy;\n" " vtf.uv = uvIn.xy;\n"
" gl_Position = posIn;\n" " gl_Position = FLIPFROMGL(posIn);\n"
"}\n"; "}\n";
static const char* FS_GLSL_TEX = static const char* FS_GLSL_TEX =
@ -67,7 +67,7 @@ BOO_GLSL_BINDING_HEAD
"void main()\n" "void main()\n"
"{\n" "{\n"
" vtf.color = colorIn * moduColor;\n" " vtf.color = colorIn * moduColor;\n"
" gl_Position = posIn;\n" " gl_Position = FLIPFROMGL(posIn);\n"
"}\n"; "}\n";
static const char* FS_GLSL_NOTEX = static const char* FS_GLSL_NOTEX =

1
Runtime/Graphics/CMoviePlayer.cpp
View File

@ -27,6 +27,7 @@ SPECTER_GLSL_VIEW_VERT_BLOCK
" vtf.uv = uvIn;\n" " vtf.uv = uvIn;\n"
" vtf.color = mulColor;\n" " vtf.color = mulColor;\n"
" gl_Position = mv * vec4(posIn, 1.0);\n" " gl_Position = mv * vec4(posIn, 1.0);\n"
" gl_Position = FLIPFROMGL(gl_Position);\n"
"}\n"; "}\n";
static const char* FS_GLSL_YUV = static const char* FS_GLSL_YUV =

1
Runtime/Particle/CElementGenShadersGLSL.cpp
View File

@ -100,6 +100,7 @@ BOO_GLSL_BINDING_HEAD
" vtf.uvTexr = uvsInTexrTind[gl_VertexID].xy;\n" " vtf.uvTexr = uvsInTexrTind[gl_VertexID].xy;\n"
" vtf.uvTind = uvsInTexrTind[gl_VertexID].zw;\n" " vtf.uvTind = uvsInTexrTind[gl_VertexID].zw;\n"
" gl_Position = mvp * posIn[gl_VertexID];\n" " gl_Position = mvp * posIn[gl_VertexID];\n"
" gl_Position = FLIPFROMGL(gl_Position);\n"
"}\n"; "}\n";
static const char* FS_GLSL_INDTEX = static const char* FS_GLSL_INDTEX =

2
hecl

@ -1 +1 @@
Subproject commit 360af21c0d1f1f56554520c6ccf50d2e93a344ae Subproject commit b43709fc030beca9ebc212fda3051087d1407714

2
specter

@ -1 +1 @@
Subproject commit f81bd59b923e830c76537306b8eda7d8fc955666 Subproject commit 6fd07871e9af57847c21f8eed9f3f4a6c0179a84