mirror of
https://github.com/opus-tango/IntroductionToVulkan.git
synced 2026-03-20 12:05:20 +00:00
Added tutorials "06 - Descriptor Sets" and "07 - Uniform Buffers". Added functions for projection matrices generation to Tools. Added function for loading images from files (with stb_image library). Updated README.md file with description of Tutorial06.
This commit is contained in:
plapins
BIN
Project/Tutorial07/Data07/frag.spv
Normal file
BIN
Project/Tutorial07/Data07/frag.spv
Normal file
Binary file not shown.
46
Project/Tutorial07/Data07/frag.spv.txt
Normal file
46
Project/Tutorial07/Data07/frag.spv.txt
Normal file
@@ -0,0 +1,46 @@
|
||||
Tutorial07/Data07/shader.frag
|
||||
Warning, version 430 is not yet complete; most version-specific features are present, but some are missing.
|
||||
|
||||
|
||||
Linked fragment stage:
|
||||
|
||||
|
||||
// Module Version 10000
|
||||
// Generated by (magic number): 80001
|
||||
// Id's are bound by 20
|
||||
|
||||
Capability Shader
|
||||
1: ExtInstImport "GLSL.std.450"
|
||||
MemoryModel Logical GLSL450
|
||||
EntryPoint Fragment 4 "main" 9 17
|
||||
ExecutionMode 4 OriginLowerLeft
|
||||
Source GLSL 430
|
||||
Name 4 "main"
|
||||
Name 9 "o_Color"
|
||||
Name 13 "u_Texture"
|
||||
Name 17 "v_Texcoord"
|
||||
Decorate 9(o_Color) Location 0
|
||||
Decorate 13(u_Texture) DescriptorSet 0
|
||||
Decorate 13(u_Texture) Binding 0
|
||||
Decorate 17(v_Texcoord) Location 0
|
||||
2: TypeVoid
|
||||
3: TypeFunction 2
|
||||
6: TypeFloat 32
|
||||
7: TypeVector 6(float) 4
|
||||
8: TypePointer Output 7(fvec4)
|
||||
9(o_Color): 8(ptr) Variable Output
|
||||
10: TypeImage 6(float) 2D sampled format:Unknown
|
||||
11: TypeSampledImage 10
|
||||
12: TypePointer UniformConstant 11
|
||||
13(u_Texture): 12(ptr) Variable UniformConstant
|
||||
15: TypeVector 6(float) 2
|
||||
16: TypePointer Input 15(fvec2)
|
||||
17(v_Texcoord): 16(ptr) Variable Input
|
||||
4(main): 2 Function None 3
|
||||
5: Label
|
||||
14: 11 Load 13(u_Texture)
|
||||
18: 15(fvec2) Load 17(v_Texcoord)
|
||||
19: 7(fvec4) ImageSampleImplicitLod 14 18
|
||||
Store 9(o_Color) 19
|
||||
Return
|
||||
FunctionEnd
|
||||
21
Project/Tutorial07/Data07/shader.frag
Normal file
21
Project/Tutorial07/Data07/shader.frag
Normal file
@@ -0,0 +1,21 @@
|
||||
// Copyright 2016 Intel Corporation All Rights Reserved
|
||||
//
|
||||
// Intel makes no representations about the suitability of this software for any purpose.
|
||||
// THIS SOFTWARE IS PROVIDED ""AS IS."" INTEL SPECIFICALLY DISCLAIMS ALL WARRANTIES,
|
||||
// EXPRESS OR IMPLIED, AND ALL LIABILITY, INCLUDING CONSEQUENTIAL AND OTHER INDIRECT DAMAGES,
|
||||
// FOR THE USE OF THIS SOFTWARE, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PROPRIETARY
|
||||
// RIGHTS, AND INCLUDING THE WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
||||
// Intel does not assume any responsibility for any errors which may appear in this software
|
||||
// nor any responsibility to update it.
|
||||
|
||||
#version 430
|
||||
|
||||
layout(set=0, binding=0) uniform sampler2D u_Texture;
|
||||
|
||||
layout(location = 0) in vec2 v_Texcoord;
|
||||
|
||||
layout(location = 0) out vec4 o_Color;
|
||||
|
||||
void main() {
|
||||
o_Color = texture( u_Texture, v_Texcoord );
|
||||
}
|
||||
30
Project/Tutorial07/Data07/shader.vert
Normal file
30
Project/Tutorial07/Data07/shader.vert
Normal file
@@ -0,0 +1,30 @@
|
||||
// Copyright 2016 Intel Corporation All Rights Reserved
|
||||
//
|
||||
// Intel makes no representations about the suitability of this software for any purpose.
|
||||
// THIS SOFTWARE IS PROVIDED ""AS IS."" INTEL SPECIFICALLY DISCLAIMS ALL WARRANTIES,
|
||||
// EXPRESS OR IMPLIED, AND ALL LIABILITY, INCLUDING CONSEQUENTIAL AND OTHER INDIRECT DAMAGES,
|
||||
// FOR THE USE OF THIS SOFTWARE, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PROPRIETARY
|
||||
// RIGHTS, AND INCLUDING THE WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
||||
// Intel does not assume any responsibility for any errors which may appear in this software
|
||||
// nor any responsibility to update it.
|
||||
|
||||
#version 450
|
||||
|
||||
layout(set=0, binding=1) uniform u_UniformBuffer {
|
||||
mat4 u_ProjectionMatrix;
|
||||
};
|
||||
|
||||
layout(location = 0) in vec4 i_Position;
|
||||
layout(location = 1) in vec2 i_Texcoord;
|
||||
|
||||
out gl_PerVertex
|
||||
{
|
||||
vec4 gl_Position;
|
||||
};
|
||||
|
||||
layout(location = 0) out vec2 v_Texcoord;
|
||||
|
||||
void main() {
|
||||
gl_Position = u_ProjectionMatrix * i_Position;
|
||||
v_Texcoord = i_Texcoord;
|
||||
}
|
||||
BIN
Project/Tutorial07/Data07/texture.png
Normal file
BIN
Project/Tutorial07/Data07/texture.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 512 KiB |
BIN
Project/Tutorial07/Data07/vert.spv
Normal file
BIN
Project/Tutorial07/Data07/vert.spv
Normal file
Binary file not shown.
71
Project/Tutorial07/Data07/vert.spv.txt
Normal file
71
Project/Tutorial07/Data07/vert.spv.txt
Normal file
@@ -0,0 +1,71 @@
|
||||
Tutorial07/Data07/shader.vert
|
||||
Warning, version 450 is not yet complete; most version-specific features are present, but some are missing.
|
||||
|
||||
|
||||
Linked vertex stage:
|
||||
|
||||
|
||||
// Module Version 10000
|
||||
// Generated by (magic number): 80001
|
||||
// Id's are bound by 32
|
||||
|
||||
Capability Shader
|
||||
1: ExtInstImport "GLSL.std.450"
|
||||
MemoryModel Logical GLSL450
|
||||
EntryPoint Vertex 4 "main" 10 21 28 30
|
||||
Source GLSL 450
|
||||
Name 4 "main"
|
||||
Name 8 "gl_PerVertex"
|
||||
MemberName 8(gl_PerVertex) 0 "gl_Position"
|
||||
Name 10 ""
|
||||
Name 14 "u_UniformBuffer"
|
||||
MemberName 14(u_UniformBuffer) 0 "u_ProjectionMatrix"
|
||||
Name 16 ""
|
||||
Name 21 "i_Position"
|
||||
Name 28 "v_Texcoord"
|
||||
Name 30 "i_Texcoord"
|
||||
MemberDecorate 8(gl_PerVertex) 0 BuiltIn Position
|
||||
Decorate 8(gl_PerVertex) Block
|
||||
MemberDecorate 14(u_UniformBuffer) 0 ColMajor
|
||||
MemberDecorate 14(u_UniformBuffer) 0 Offset 0
|
||||
MemberDecorate 14(u_UniformBuffer) 0 MatrixStride 16
|
||||
Decorate 14(u_UniformBuffer) Block
|
||||
Decorate 16 DescriptorSet 0
|
||||
Decorate 16 Binding 1
|
||||
Decorate 21(i_Position) Location 0
|
||||
Decorate 28(v_Texcoord) Location 0
|
||||
Decorate 30(i_Texcoord) Location 1
|
||||
2: TypeVoid
|
||||
3: TypeFunction 2
|
||||
6: TypeFloat 32
|
||||
7: TypeVector 6(float) 4
|
||||
8(gl_PerVertex): TypeStruct 7(fvec4)
|
||||
9: TypePointer Output 8(gl_PerVertex)
|
||||
10: 9(ptr) Variable Output
|
||||
11: TypeInt 32 1
|
||||
12: 11(int) Constant 0
|
||||
13: TypeMatrix 7(fvec4) 4
|
||||
14(u_UniformBuffer): TypeStruct 13
|
||||
15: TypePointer Uniform 14(u_UniformBuffer)
|
||||
16: 15(ptr) Variable Uniform
|
||||
17: TypePointer Uniform 13
|
||||
20: TypePointer Input 7(fvec4)
|
||||
21(i_Position): 20(ptr) Variable Input
|
||||
24: TypePointer Output 7(fvec4)
|
||||
26: TypeVector 6(float) 2
|
||||
27: TypePointer Output 26(fvec2)
|
||||
28(v_Texcoord): 27(ptr) Variable Output
|
||||
29: TypePointer Input 26(fvec2)
|
||||
30(i_Texcoord): 29(ptr) Variable Input
|
||||
4(main): 2 Function None 3
|
||||
5: Label
|
||||
18: 17(ptr) AccessChain 16 12
|
||||
19: 13 Load 18
|
||||
22: 7(fvec4) Load 21(i_Position)
|
||||
23: 7(fvec4) MatrixTimesVector 19 22
|
||||
25: 24(ptr) AccessChain 10 12
|
||||
Store 25 23
|
||||
31: 26(fvec2) Load 30(i_Texcoord)
|
||||
Store 28(v_Texcoord) 31
|
||||
Return
|
||||
FunctionEnd
|
||||
Reference in New Issue
Block a user