michael/pathfinder
michael
/
pathfinder
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update `spirv-cross` to upstream master. 

A fix has been merged for the issue that was breaking Pathfinder, so we can now
use the master branch.
This commit is contained in:
Patrick Walton 2019-06-21 07:24:06 -07:00
parent 0012f09eeb
commit de0662e08e
5 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
resources/shaders/gl3/reproject.vs.glsl
View File

@ -27,6 +27,7 @@ void main(){
gl_Position = uNewTransform * vec4(position, 0.0, 1.0); gl_Position = uNewTransform * vec4(position, 0.0, 1.0);
} }

6
resources/shaders/metal/debug_texture.fs.metal
View File

@ -6,9 +6,9 @@ using namespace metal;
struct spvDescriptorSetBuffer0 struct spvDescriptorSetBuffer0
{ {
constant float4* uColor [[id(0)]]; texture2d<float> uTexture [[id(0)]];
texture2d<float> uTexture [[id(1)]]; sampler uTextureSmplr [[id(1)]];
sampler uTextureSmplr [[id(2)]]; constant float4* uColor [[id(2)]];
}; };
struct main0_out struct main0_out

10
resources/shaders/metal/post.fs.metal
View File

@ -8,12 +8,12 @@ using namespace metal;
struct spvDescriptorSetBuffer0 struct spvDescriptorSetBuffer0
{ {
constant float4* uKernel [[id(0)]]; texture2d<float> uGammaLUT [[id(0)]];
texture2d<float> uGammaLUT [[id(1)]]; sampler uGammaLUTSmplr [[id(1)]];
texture2d<float> uSource [[id(2)]]; constant float4* uKernel [[id(2)]];
constant float2* uSourceSize [[id(3)]]; texture2d<float> uSource [[id(3)]];
sampler uSourceSmplr [[id(4)]]; sampler uSourceSmplr [[id(4)]];
sampler uGammaLUTSmplr [[id(5)]]; constant float2* uSourceSize [[id(5)]];
constant int* uGammaCorrectionEnabled [[id(6)]]; constant int* uGammaCorrectionEnabled [[id(6)]];
constant float4* uBGColor [[id(7)]]; constant float4* uBGColor [[id(7)]];
constant float4* uFGColor [[id(8)]]; constant float4* uFGColor [[id(8)]];

10
resources/shaders/metal/tile_alpha_multicolor.vs.metal
View File

@ -9,11 +9,11 @@ using namespace metal;
struct spvDescriptorSetBuffer0 struct spvDescriptorSetBuffer0
{ {
constant float2* uTileSize [[id(0)]]; constant float2* uTileSize [[id(0)]];
texture2d<float> uPaintTexture [[id(1)]]; constant float2* uViewBoxOrigin [[id(1)]];
constant float2* uViewBoxOrigin [[id(2)]]; constant float2* uFramebufferSize [[id(2)]];
sampler uPaintTextureSmplr [[id(3)]]; constant float2* uStencilTextureSize [[id(3)]];
constant float2* uFramebufferSize [[id(4)]]; texture2d<float> uPaintTexture [[id(4)]];
constant float2* uStencilTextureSize [[id(5)]]; sampler uPaintTextureSmplr [[id(5)]];
}; };
struct main0_out struct main0_out

8
resources/shaders/metal/tile_solid_multicolor.vs.metal
View File

@ -9,10 +9,10 @@ using namespace metal;
struct spvDescriptorSetBuffer0 struct spvDescriptorSetBuffer0
{ {
constant float2* uTileSize [[id(0)]]; constant float2* uTileSize [[id(0)]];
texture2d<float> uPaintTexture [[id(1)]]; constant float2* uViewBoxOrigin [[id(1)]];
constant float2* uViewBoxOrigin [[id(2)]]; constant float2* uFramebufferSize [[id(2)]];
sampler uPaintTextureSmplr [[id(3)]]; texture2d<float> uPaintTexture [[id(3)]];
constant float2* uFramebufferSize [[id(4)]]; sampler uPaintTextureSmplr [[id(4)]];
}; };
struct main0_out struct main0_out