OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vk/test: Use the glsl_scraper for building shaders

Browse Source
This commit is contained in:
Jason Ekstrand
2015-05-21 11:59:29 -07:00
parent f3d70e4165
commit ccf2bf9b99
2 changed files with 11 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/vulkan/Makefile.am
View File

@@ -73,7 +73,8 @@ libvulkan_la_SOURCES = \
BUILT_SOURCES = \
entrypoints.h \
entrypoints.c \
meta-spirv.h
meta-spirv.h \
vk-spirv.h
entrypoints.h : vk_gen.py $(vulkan_include_HEADERS)
$(AM_V_GEN)cat $(vulkan_include_HEADERS) | $(PYTHON2) $< header > $@

34
src/vulkan/vk.c
View File

@@ -13,6 +13,8 @@
#include <poll.h>
#include <libpng16/png.h>
#include "vk-spirv.h"
#define for_each_bit(b, dword) \
for (uint32_t __dword = (dword); \
(b) = __builtin_ffs(__dword) - 1, __dword; \
@@ -100,7 +102,7 @@ create_pipeline(VkDevice device, VkPipeline *pipeline,
.primitiveRestartIndex = 0
};
static const char vs_source[] = GLSL(
VkShader vs = GLSL_VK_SHADER(device, VERTEX,
layout(location = 0) in vec4 a_position;
layout(location = 1) in vec4 a_color;
layout(set = 0, binding = 0) uniform block1 {
@@ -117,36 +119,18 @@ create_pipeline(VkDevice device, VkPipeline *pipeline,
{
gl_Position = a_position;
v_color = a_color + u1.color + u2.color + u3.color;
});
}
);
static const char fs_source[] = GLSL(
VkShader fs = GLSL_VK_SHADER(device, FRAGMENT,
out vec4 f_color;
in vec4 v_color;
layout(set = 0, binding = 0) uniform sampler2D tex;
void main()
{
f_color = v_color + texture2D(tex, vec2(0.1, 0.1));
});
VkShader vs;
vkCreateShader(device,
&(VkShaderCreateInfo) {
.sType = VK_STRUCTURE_TYPE_SHADER_CREATE_INFO,
.codeSize = sizeof(vs_source),
.pCode = vs_source,
.flags = 0
},
&vs);
VkShader fs;
vkCreateShader(device,
&(VkShaderCreateInfo) {
.sType = VK_STRUCTURE_TYPE_SHADER_CREATE_INFO,
.codeSize = sizeof(fs_source),
.pCode = fs_source,
.flags = 0
},
&fs);
f_color = v_color + texture(tex, vec2(0.1, 0.1));
}
);
VkPipelineShaderStageCreateInfo vs_create_info = {
.sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO,