wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-04-13 05:43:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

demos: Get rid of handwritten GLSL shaders.

Browse Source
This commit is contained in:
Józef Kucia
2017-07-28 15:26:09 +02:00
parent fec337a03c
commit aa5d48eec4
16 changed files with 606 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
demos/triangle.c
View File

@ -45,6 +45,9 @@
#include <assert.h>
#include "demo.h"
#include "triangle_vs.h"
#include "triangle_ps.h"
struct cxt_fence
{
ID3D12Fence *fence;
@ -236,16 +239,6 @@ static void cxt_destroy_assets(struct cx_triangle *cxt)
ID3D12RootSignature_Release(cxt->root_signature);
}
static void cxt_load_shaders(struct cx_triangle *cxt, D3D12_SHADER_BYTECODE *vs, D3D12_SHADER_BYTECODE *ps)
{
bool ret;
ret = demo_load_shader(&cxt->demo, L"triangle.hlsl", "vs_main", "vs_5_0", "triangle.vert.spv", vs);
assert(ret);
ret = demo_load_shader(&cxt->demo, L"triangle.hlsl", "ps_main", "ps_5_0", "triangle.frag.spv", ps);
assert(ret);
}
static void cxt_fence_create(struct cxt_fence *fence, ID3D12Device *device)
{
HRESULT hr;
@ -295,7 +288,10 @@ static void cxt_load_assets(struct cx_triangle *cxt)
pso_desc.InputLayout.pInputElementDescs = il_desc;
pso_desc.InputLayout.NumElements = ARRAY_SIZE(il_desc);
pso_desc.pRootSignature = cxt->root_signature;
cxt_load_shaders(cxt, &pso_desc.VS, &pso_desc.PS);
pso_desc.VS.pShaderBytecode = g_vs_main;
pso_desc.VS.BytecodeLength = sizeof(g_vs_main);
pso_desc.PS.pShaderBytecode = g_ps_main;
pso_desc.PS.BytecodeLength = sizeof(g_ps_main);
demo_rasterizer_desc_init_default(&pso_desc.RasterizerState);
demo_blend_desc_init_default(&pso_desc.BlendState);
pso_desc.DepthStencilState.DepthEnable = FALSE;
@ -309,9 +305,6 @@ static void cxt_load_assets(struct cx_triangle *cxt)
&IID_ID3D12PipelineState, (void **)&cxt->pipeline_state);
assert(SUCCEEDED(hr));
free((void *)pso_desc.PS.pShaderBytecode);
free((void *)pso_desc.VS.pShaderBytecode);
hr = ID3D12Device_CreateCommandList(cxt->device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT, cxt->command_allocator,
cxt->pipeline_state, &IID_ID3D12GraphicsCommandList, (void **)&cxt->command_list);
assert(SUCCEEDED(hr));