diff options
author | Kevin Ottens <kevin.ottens@kdab.com> | 2017-08-02 17:51:18 +0200 |
---|---|---|
committer | Kevin Ottens <kevin.ottens@kdab.com> | 2017-09-27 18:10:33 +0000 |
commit | 16b0e6dc9b6043b8d98a661a3010879add15409d (patch) | |
tree | 016e2e28e2aea06e2f6093c3b26123b43e265ca1 /src/extras/extras.qrc | |
parent | 879e4d5fd5126a23b507e08935253378b1a0dc60 (diff) |
Move most vertex shaders into a unified one
We currently do a bit more work than strictly needed in some cases, but
that will change later on when this shader is converted into a graph.
Changing now will make this future refactoring easier.
Change-Id: I887601c18575bef79e25a23ed054aa336b1e860a
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/extras/extras.qrc')
-rw-r--r-- | src/extras/extras.qrc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/extras/extras.qrc b/src/extras/extras.qrc index 7310a7c79..c51d47eb5 100644 --- a/src/extras/extras.qrc +++ b/src/extras/extras.qrc @@ -7,22 +7,18 @@ <file>shaders/gl3/metalrough.inc.frag</file> <file>shaders/gl3/coordinatesystems.inc</file> <file>shaders/es2/coordinatesystems.inc</file> - <file>shaders/gl3/phong.vert</file> <file>shaders/gl3/phong.frag</file> - <file>shaders/es2/phong.vert</file> <file>shaders/es2/phong.frag</file> <file>shaders/gl3/normaldiffusespecularmap.frag</file> - <file>shaders/gl3/diffusemap.vert</file> <file>shaders/gl3/diffusemap.frag</file> <file>shaders/es2/normaldiffusespecularmap.frag</file> - <file>shaders/es2/diffusemap.vert</file> <file>shaders/es2/diffusemap.frag</file> - <file>shaders/es2/normaldiffusemap.vert</file> <file>shaders/es2/normaldiffusemap.frag</file> <file>shaders/gl3/normaldiffusemap.frag</file> - <file>shaders/gl3/normaldiffusemap.vert</file> <file>shaders/es2/diffusespecularmap.frag</file> <file>shaders/gl3/diffusespecularmap.frag</file> + <file>shaders/gl3/default.vert</file> + <file>shaders/es2/default.vert</file> <file>shaders/gl3/pervertexcolor.frag</file> <file>shaders/gl3/pervertexcolor.vert</file> <file>shaders/es2/pervertexcolor.frag</file> @@ -39,7 +35,6 @@ <file>shaders/gl3/unlittexture.frag</file> <file>shaders/es2/unlittexture.frag</file> <file>shaders/es2/unlittexture.vert</file> - <file>shaders/gl3/metalrough.vert</file> <file>shaders/gl3/distancefieldtext.vert</file> <file>shaders/gl3/distancefieldtext.frag</file> <file>shaders/es2/distancefieldtext.frag</file> |