Skip to content

Commit 3560e76

Browse files
hoffstadthoffstadt
committed
refac: change "tPixelShader" to "tFragmentShader" in graphics ext
1 parent 17448be commit 3560e76

File tree

9 files changed

+61
-48
lines changed

9 files changed

+61
-48
lines changed

‎examples/example_gfx_0.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,8 +245,8 @@ pl_app_load(plApiRegistryI* ptApiRegistry, plAppData* ptAppData)
245245
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~shaders~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
246246

247247
const plShaderDesc tShaderDesc = {
248-
.tVertexShader = gptShader->load_glsl("example_gfx_0.vert", "main", NULL, NULL),
249-
.tPixelShader = gptShader->load_glsl("example_gfx_0.frag", "main", NULL, NULL),
248+
.tVertexShader = gptShader->load_glsl("example_gfx_0.vert", "main", NULL, NULL),
249+
.tFragmentShader = gptShader->load_glsl("example_gfx_0.frag", "main", NULL, NULL),
250250
.tGraphicsState = {
251251
.ulDepthWriteEnabled = 0,
252252
.ulDepthMode = PL_COMPARE_MODE_ALWAYS,

‎examples/example_gfx_1.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,8 +272,8 @@ pl_app_load(plApiRegistryI* ptApiRegistry, plAppData* ptAppData)
272272
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~shaders~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
273273

274274
const plShaderDesc tShaderDesc = {
275-
.tVertexShader = gptShader->load_glsl("example_gfx_0.vert", "main", NULL, NULL),
276-
.tPixelShader = gptShader->load_glsl("example_gfx_0.frag", "main", NULL, NULL),
275+
.tVertexShader = gptShader->load_glsl("example_gfx_0.vert", "main", NULL, NULL),
276+
.tFragmentShader = gptShader->load_glsl("example_gfx_0.frag", "main", NULL, NULL),
277277
.tGraphicsState = {
278278
.ulDepthWriteEnabled = 0,
279279
.ulDepthMode = PL_COMPARE_MODE_ALWAYS,

‎examples/example_gfx_2.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -415,8 +415,8 @@ pl_app_load(plApiRegistryI* ptApiRegistry, plAppData* ptAppData)
415415
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~shaders~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
416416

417417
const plShaderDesc tShaderDesc = {
418-
.tVertexShader = gptShader->load_glsl("example_gfx_2.vert", "main", NULL, NULL),
419-
.tPixelShader = gptShader->load_glsl("example_gfx_2.frag", "main", NULL, NULL),
418+
.tVertexShader = gptShader->load_glsl("example_gfx_2.vert", "main", NULL, NULL),
419+
.tFragmentShader = gptShader->load_glsl("example_gfx_2.frag", "main", NULL, NULL),
420420
.tGraphicsState = {
421421
.ulDepthWriteEnabled = 0,
422422
.ulDepthMode = PL_COMPARE_MODE_ALWAYS,

‎extensions/pl_draw_backend_ext.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -404,8 +404,8 @@ pl__get_3d_pipeline(plRenderPassHandle tRenderPass, uint32_t uMSAASampleCount, p
404404

405405
{
406406
const plShaderDesc t3DShaderDesc = {
407-
.tPixelShader = gptShader->load_glsl("draw_3d.frag", "main", NULL, NULL),
408-
.tVertexShader = gptShader->load_glsl("draw_3d.vert", "main", NULL, NULL),
407+
.tFragmentShader = gptShader->load_glsl("draw_3d.frag", "main", NULL, NULL),
408+
.tVertexShader = gptShader->load_glsl("draw_3d.vert", "main", NULL, NULL),
409409
.tGraphicsState = {
410410
.ulDepthWriteEnabled = tFlags & PL_DRAW_FLAG_DEPTH_WRITE ? 1 : 0,
411411
.ulDepthMode = tFlags & PL_DRAW_FLAG_DEPTH_TEST ? (tFlags & PL_DRAW_FLAG_REVERSE_Z_DEPTH ? PL_COMPARE_MODE_GREATER : PL_COMPARE_MODE_LESS) : PL_COMPARE_MODE_ALWAYS,
@@ -448,8 +448,8 @@ pl__get_3d_pipeline(plRenderPassHandle tRenderPass, uint32_t uMSAASampleCount, p
448448

449449
{
450450
const plShaderDesc t3DLineShaderDesc = {
451-
.tPixelShader = gptShader->load_glsl("draw_3d.frag", "main", NULL, NULL),
452-
.tVertexShader = gptShader->load_glsl("draw_3d_line.vert", "main", NULL, NULL),
451+
.tFragmentShader = gptShader->load_glsl("draw_3d.frag", "main", NULL, NULL),
452+
.tVertexShader = gptShader->load_glsl("draw_3d_line.vert", "main", NULL, NULL),
453453
.tGraphicsState = {
454454
.ulDepthWriteEnabled = tFlags & PL_DRAW_FLAG_DEPTH_WRITE,
455455
.ulDepthMode = tFlags & PL_DRAW_FLAG_DEPTH_TEST ? (tFlags & PL_DRAW_FLAG_REVERSE_Z_DEPTH ? PL_COMPARE_MODE_GREATER : PL_COMPARE_MODE_LESS) : PL_COMPARE_MODE_ALWAYS,
@@ -517,8 +517,8 @@ pl__get_2d_pipeline(plRenderPassHandle tRenderPass, uint32_t uMSAASampleCount, u
517517
ptEntry->uSubpassIndex = uSubpassIndex;
518518

519519
const plShaderDesc tRegularShaderDesc = {
520-
.tPixelShader = gptShader->load_glsl("draw_2d.frag", "main", NULL, NULL),
521-
.tVertexShader = gptShader->load_glsl("draw_2d.vert", "main", NULL, NULL),
520+
.tFragmentShader = gptShader->load_glsl("draw_2d.frag", "main", NULL, NULL),
521+
.tVertexShader = gptShader->load_glsl("draw_2d.vert", "main", NULL, NULL),
522522
.tGraphicsState = {
523523
.ulDepthWriteEnabled = 0,
524524
.ulDepthMode = PL_COMPARE_MODE_ALWAYS,
@@ -572,8 +572,8 @@ pl__get_2d_pipeline(plRenderPassHandle tRenderPass, uint32_t uMSAASampleCount, u
572572
pl_temp_allocator_reset(&gptDrawBackendCtx->tTempAllocator);
573573

574574
const plShaderDesc tSecondaryShaderDesc = {
575-
.tPixelShader = gptShader->load_glsl("draw_2d_sdf.frag", "main", NULL, NULL),
576-
.tVertexShader = gptShader->load_glsl("draw_2d.vert", "main", NULL, NULL),
575+
.tFragmentShader = gptShader->load_glsl("draw_2d_sdf.frag", "main", NULL, NULL),
576+
.tVertexShader = gptShader->load_glsl("draw_2d.vert", "main", NULL, NULL),
577577
.tGraphicsState = {
578578
.ulDepthWriteEnabled = 0,
579579
.ulDepthMode = PL_COMPARE_MODE_ALWAYS,

‎extensions/pl_graphics_ext.h‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -892,7 +892,17 @@ typedef struct _plShaderDesc
892892
plBlendState atBlendStates[PL_MAX_RENDER_TARGETS];
893893
plVertexBufferLayout atVertexBufferLayouts[2];
894894
plShaderModule tVertexShader;
895-
plShaderModule tPixelShader;
895+
896+
#ifndef PL_DISABLE_OBSOLETE
897+
union
898+
{
899+
plShaderModule tPixelShader;
900+
plShaderModule tFragmentShader;
901+
};
902+
#else
903+
plShaderModule tFragmentShader;
904+
#endif
905+
896906
const void* pTempConstantData;
897907
plBindGroupLayoutDesc atBindGroupLayouts[3];
898908
plRenderPassLayoutHandle tRenderPassLayout;

‎extensions/pl_graphics_metal.m‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1267,8 +1267,8 @@
12671267

12681268
plMetalShader* ptMetalShader = &ptDevice->sbtShadersHot[tHandle.uIndex];
12691269

1270-
if(ptShader->tDesc.tPixelShader.pcEntryFunc == NULL)
1271-
ptShader->tDesc.tPixelShader.pcEntryFunc = "fragment_main";
1270+
if(ptShader->tDesc.tFragmentShader.pcEntryFunc == NULL)
1271+
ptShader->tDesc.tFragmentShader.pcEntryFunc = "fragment_main";
12721272

12731273
if(ptShader->tDesc.tVertexShader.pcEntryFunc == NULL)
12741274
ptShader->tDesc.tVertexShader.pcEntryFunc = "vertex_main";
@@ -1348,9 +1348,9 @@
13481348
NSLog(@"Error: failed to create Metal vertex library: %@", error);
13491349
}
13501350

1351-
if(ptShader->tDesc.tPixelShader.puCode)
1351+
if(ptShader->tDesc.tFragmentShader.puCode)
13521352
{
1353-
NSString* fragmentSource = [NSString stringWithUTF8String:(const char*)ptShader->tDesc.tPixelShader.puCode];
1353+
NSString* fragmentSource = [NSString stringWithUTF8String:(const char*)ptShader->tDesc.tFragmentShader.puCode];
13541354
ptMetalShader->tFragmentLibrary = [ptDevice->tDevice newLibraryWithSource:fragmentSource options:ptCompileOptions error:&error];
13551355
if (ptMetalShader->tFragmentLibrary == nil)
13561356
{
@@ -1405,7 +1405,7 @@
14051405
NSLog(@"Error: failed to find Metal shader functions in library: %@", error);
14061406
}
14071407

1408-
if(ptShader->tDesc.tPixelShader.puCode)
1408+
if(ptShader->tDesc.tFragmentShader.puCode)
14091409
{
14101410
fragmentFunction = [ptMetalShader->tFragmentLibrary newFunctionWithName:fragmentEntry constantValues:ptConstantValues error:&error];
14111411
if (fragmentFunction == nil)

‎extensions/pl_graphics_vulkan.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1462,7 +1462,7 @@ pl_create_shader(plDevice* ptDevice, const plShaderDesc* ptDescription)
14621462
// TODO: handle these properly
14631463

14641464
// if(ptDescription->pcPixelShaderEntryFunc == NULL)
1465-
ptShader->tDesc.tPixelShader.pcEntryFunc = "main";
1465+
ptShader->tDesc.tFragmentShader.pcEntryFunc = "main";
14661466

14671467
// if(ptDescription->pcVertexShaderEntryFunc == NULL)
14681468
ptShader->tDesc.tVertexShader.pcEntryFunc = "main";
@@ -1494,13 +1494,13 @@ pl_create_shader(plDevice* ptDevice, const plShaderDesc* ptDescription)
14941494
};
14951495
PL_VULKAN(vkCreateShaderModule(ptDevice->tLogicalDevice, &tVertexShaderCreateInfo, gptGraphics->ptAllocationCallbacks, &ptVulkanShader->tVertexShaderModule));
14961496

1497-
if (ptShader->tDesc.tPixelShader.puCode)
1497+
if (ptShader->tDesc.tFragmentShader.puCode)
14981498
{
14991499
uStageCount++;
15001500
VkShaderModuleCreateInfo tPixelShaderCreateInfo = {
15011501
.sType = VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO,
1502-
.codeSize = ptShader->tDesc.tPixelShader.szCodeSize,
1503-
.pCode = (const uint32_t *)(ptShader->tDesc.tPixelShader.puCode)
1502+
.codeSize = ptShader->tDesc.tFragmentShader.szCodeSize,
1503+
.pCode = (const uint32_t *)(ptShader->tDesc.tFragmentShader.puCode)
15041504
};
15051505

15061506
PL_VULKAN(vkCreateShaderModule(ptDevice->tLogicalDevice, &tPixelShaderCreateInfo, gptGraphics->ptAllocationCallbacks, &ptVulkanShader->tPixelShaderModule));
@@ -1655,7 +1655,7 @@ pl_create_shader(plDevice* ptDevice, const plShaderDesc* ptDescription)
16551655
.sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO,
16561656
.stage = VK_SHADER_STAGE_FRAGMENT_BIT,
16571657
.module = ptVulkanShader->tPixelShaderModule,
1658-
.pName = ptShader->tDesc.tPixelShader.pcEntryFunc,
1658+
.pName = ptShader->tDesc.tFragmentShader.pcEntryFunc,
16591659
.pSpecializationInfo = &tSpecializationInfo
16601660
};
16611661

‎extensions/pl_shader_variant_ext.c‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -424,6 +424,7 @@ pl_shader_tool_load_manifest(const char* pcPath)
424424
plJsonObject* ptShaderMember = pl_json_member(ptComputeShader, "tShader");
425425
char acFileBuffer[256] = {0};
426426
char acEntryBuffer[64] = {0};
427+
strncpy(acEntryBuffer, "main", 64);
427428
pl_json_string_member(ptShaderMember, "file", acFileBuffer, 256);
428429
pl_json_string_member(ptShaderMember, "entry", acEntryBuffer, 64);
429430

@@ -547,12 +548,14 @@ pl_shader_tool_load_manifest(const char* pcPath)
547548
plJsonObject* ptVertexShaderMember = pl_json_member(ptGraphicsShader, "tVertexShader");
548549
char acFileBuffer[256] = {0};
549550
char acEntryBuffer[64] = {0};
551+
strncpy(acEntryBuffer, "main", 64);
550552
pl_json_string_member(ptVertexShaderMember, "file", acFileBuffer, 256);
551553
pl_json_string_member(ptVertexShaderMember, "entry", acEntryBuffer, 64);
552554

553-
plJsonObject* ptPixelShaderMember = pl_json_member(ptGraphicsShader, "tPixelShader");
555+
plJsonObject* ptPixelShaderMember = pl_json_member(ptGraphicsShader, "tFragmentShader");
554556
char acFileBuffer2[256] = {0};
555557
char acEntryBuffer2[64] = {0};
558+
strncpy(acEntryBuffer2, "main", 64);
556559
if(ptPixelShaderMember)
557560
{
558561
pl_json_string_member(ptPixelShaderMember, "file", acFileBuffer2, 256);
@@ -564,7 +567,7 @@ pl_shader_tool_load_manifest(const char* pcPath)
564567
tShaderDesc.tVertexShader = gptShader->load_glsl(acFileBuffer, acEntryBuffer, NULL, NULL);
565568

566569
if(ptPixelShaderMember)
567-
tShaderDesc.tPixelShader = gptShader->load_glsl(acFileBuffer2, acEntryBuffer2, NULL, NULL);
570+
tShaderDesc.tFragmentShader = gptShader->load_glsl(acFileBuffer2, acEntryBuffer2, NULL, NULL);
568571

569572
tShaderDesc.uSubpassIndex = pl_json_uint_member(ptGraphicsShader, "uSubpassIndex", 0);
570573

‎shaders/shaders.pls‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"compute shaders": [
4646
{
4747
"pcName": "panorama_to_cubemap",
48-
"tShader": { "file": "panorama_to_cubemap.comp", "entry": "main" },
48+
"tShader": { "file": "panorama_to_cubemap.comp"},
4949
"atConstants": [
5050
{ "tType": "PL_DATA_TYPE_INT" },
5151
{ "tType": "PL_DATA_TYPE_INT" },
@@ -67,7 +67,7 @@
6767
},
6868
{
6969
"pcName": "jumpfloodalgo",
70-
"tShader": { "file": "jumpfloodalgo.comp", "entry": "main" },
70+
"tShader": { "file": "jumpfloodalgo.comp"},
7171
"atBindGroupLayouts": [
7272
{
7373
"atTextureBindings": [
@@ -79,7 +79,7 @@
7979
},
8080
{
8181
"pcName": "filter_environment",
82-
"tShader": { "file": "filter_environment.comp", "entry": "main" },
82+
"tShader": { "file": "filter_environment.comp"},
8383
"atBindGroupLayouts": [
8484
{
8585
"atTextureBindings": [
@@ -102,7 +102,7 @@
102102
},
103103
{
104104
"pcName": "skinning",
105-
"tShader": { "file": "skinning.comp", "entry": "main" },
105+
"tShader": { "file": "skinning.comp"},
106106
"atConstants": [
107107
{ "tType": "PL_DATA_TYPE_INT" },
108108
{ "tType": "PL_DATA_TYPE_INT" },
@@ -132,8 +132,8 @@
132132
"graphics shaders": [
133133
{
134134
"pcName": "tonemap",
135-
"tVertexShader": { "file": "full_quad.vert", "entry": "main" },
136-
"tPixelShader": { "file": "tonemap.frag", "entry": "main" },
135+
"tVertexShader": { "file": "full_quad.vert"},
136+
"tFragmentShader": { "file": "tonemap.frag"},
137137
"tGraphicsState": {
138138
"ulDepthWriteEnabled": false,
139139
"ulDepthMode": "PL_COMPARE_MODE_ALWAYS",
@@ -174,8 +174,8 @@
174174
},
175175
{
176176
"pcName": "skybox",
177-
"tVertexShader": { "file": "skybox.vert", "entry": "main" },
178-
"tPixelShader": { "file": "skybox.frag", "entry": "main" },
177+
"tVertexShader": { "file": "skybox.vert"},
178+
"tFragmentShader": { "file": "skybox.frag"},
179179
"tGraphicsState": {
180180
"ulDepthWriteEnabled": false,
181181
"ulDepthMode": "PL_COMPARE_MODE_EQUAL",
@@ -219,8 +219,8 @@
219219
},
220220
{
221221
"pcName": "gbuffer_fill",
222-
"tVertexShader": { "file": "gbuffer_fill.vert", "entry": "main" },
223-
"tPixelShader": { "file": "gbuffer_fill.frag", "entry": "main" },
222+
"tVertexShader": { "file": "gbuffer_fill.vert"},
223+
"tFragmentShader": { "file": "gbuffer_fill.frag"},
224224
"atVertexBufferLayouts": [
225225
{
226226
"atAttributes": [
@@ -253,8 +253,8 @@
253253
},
254254
{
255255
"pcName": "forward",
256-
"tVertexShader": { "file": "forward.vert", "entry": "main" },
257-
"tPixelShader": { "file": "forward.frag", "entry": "main" },
256+
"tVertexShader": { "file": "forward.vert"},
257+
"tFragmentShader": { "file": "forward.frag"},
258258
"atVertexBufferLayouts": [
259259
{
260260
"atAttributes": [
@@ -290,8 +290,8 @@
290290
},
291291
{
292292
"pcName": "uvmap",
293-
"tVertexShader": { "file": "uvmap.vert", "entry": "main" },
294-
"tPixelShader": { "file": "uvmap.frag", "entry": "main" },
293+
"tVertexShader": { "file": "uvmap.vert"},
294+
"tFragmentShader": { "file": "uvmap.frag"},
295295
"tGraphicsState": {
296296
"ulDepthWriteEnabled": false,
297297
"ulDepthMode": "PL_COMPARE_MODE_ALWAYS",
@@ -320,8 +320,8 @@
320320
},
321321
{
322322
"pcName": "picking",
323-
"tVertexShader": { "file": "picking.vert", "entry": "main" },
324-
"tPixelShader": { "file": "picking.frag", "entry": "main" },
323+
"tVertexShader": { "file": "picking.vert"},
324+
"tFragmentShader": { "file": "picking.frag"},
325325
"tGraphicsState": {
326326
"ulDepthWriteEnabled": false,
327327
"ulDepthMode": "PL_COMPARE_MODE_EQUAL",
@@ -361,7 +361,7 @@
361361
},
362362
{
363363
"pcName": "shadow",
364-
"tVertexShader": { "file": "shadow.vert", "entry": "main" },
364+
"tVertexShader": { "file": "shadow.vert"},
365365
"tGraphicsState": {
366366
"ulDepthWriteEnabled": true,
367367
"ulDepthMode": "PL_COMPARE_MODE_GREATER_OR_EQUAL",
@@ -407,8 +407,8 @@
407407
},
408408
{
409409
"pcName": "alphashadow",
410-
"tVertexShader": { "file": "shadow.vert", "entry": "main" },
411-
"tPixelShader": { "file": "shadow.frag", "entry": "main" },
410+
"tVertexShader": { "file": "shadow.vert"},
411+
"tFragmentShader": { "file": "shadow.frag"},
412412
"tGraphicsState": {
413413
"ulDepthWriteEnabled": true,
414414
"ulDepthMode": "PL_COMPARE_MODE_GREATER_OR_EQUAL",
@@ -454,8 +454,8 @@
454454
},
455455
{
456456
"pcName": "deferred_lighting",
457-
"tVertexShader": { "file": "deferred_lighting.vert", "entry": "main" },
458-
"tPixelShader": { "file": "deferred_lighting.frag", "entry": "main" },
457+
"tVertexShader": { "file": "deferred_lighting.vert"},
458+
"tFragmentShader": { "file": "deferred_lighting.frag"},
459459
"tGraphicsState": {
460460
"ulDepthWriteEnabled": false,
461461
"ulDepthMode": "PL_COMPARE_MODE_ALWAYS",

0 commit comments

Comments
 (0)