Skip to content

Commit 5594f0f

Browse files
TheMostDiligentTheMostDiligent
committed
Moved UseCombinedTextureSamplers and CombinedSamplerSuffix members from ShaderCreateInfo to ShaderDesc (API252006)
1 parent e7ed06e commit 5594f0f

36 files changed

Lines changed: 134 additions & 180 deletions

File tree

‎Android/HelloAR/src/main/cpp/BackgroundRenderer.cc‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -126,25 +126,22 @@ void BackgroundRenderer::Initialize(Diligent::IRenderDevice* pDevice)
126126
PSOCreateInfo.GraphicsPipeline.DepthStencilDesc.DepthEnable = False;
127127

128128
ShaderCreateInfo ShaderCI;
129-
ShaderCI.SourceLanguage = SHADER_SOURCE_LANGUAGE_GLSL_VERBATIM;
130-
ShaderCI.UseCombinedTextureSamplers = true;
129+
ShaderCI.SourceLanguage = SHADER_SOURCE_LANGUAGE_GLSL_VERBATIM;
131130

132131
RefCntAutoPtr<IShader> pVS;
133132
{
134-
ShaderCI.Desc.ShaderType = SHADER_TYPE_VERTEX;
135-
ShaderCI.EntryPoint = "main";
136-
ShaderCI.Desc.Name = "Background vertex shader";
137-
ShaderCI.Source = kVertexShaderSource;
133+
ShaderCI.Desc = {"Background vertex shader", SHADER_TYPE_VERTEX, true};
134+
ShaderCI.EntryPoint = "main";
135+
ShaderCI.Source = kVertexShaderSource;
138136
pDevice->CreateShader(ShaderCI, &pVS);
139137
VERIFY(pVS, "Failed to create background vertex shader");
140138
}
141139

142140
RefCntAutoPtr<IShader> pPS;
143141
{
144-
ShaderCI.Desc.ShaderType = SHADER_TYPE_PIXEL;
145-
ShaderCI.EntryPoint = "main";
146-
ShaderCI.Desc.Name = "Background fragment shader";
147-
ShaderCI.Source = kFragmentShaderSource;
142+
ShaderCI.Desc = {"Background fragment shader", SHADER_TYPE_PIXEL, true};
143+
ShaderCI.EntryPoint = "main";
144+
ShaderCI.Source = kFragmentShaderSource;
148145
pDevice->CreateShader(ShaderCI, &pPS);
149146
VERIFY(pPS, "Failed to create background fragment shader");
150147
}

‎Android/HelloAR/src/main/cpp/ObjectRenderer.cc‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,7 @@ void ObjRenderer::Initialize(IRenderDevice* pDevice)
9595
PSOCreateInfo.GraphicsPipeline.DepthStencilDesc.DepthEnable = True;
9696

9797
ShaderCreateInfo ShaderCI;
98-
ShaderCI.SourceLanguage = SHADER_SOURCE_LANGUAGE_HLSL;
99-
ShaderCI.UseCombinedTextureSamplers = true;
98+
ShaderCI.SourceLanguage = SHADER_SOURCE_LANGUAGE_HLSL;
10099

101100
// Create a shader source stream factory to load shaders from files.
102101
RefCntAutoPtr<IShaderSourceInputStreamFactory> pShaderSourceFactory;
@@ -105,20 +104,18 @@ void ObjRenderer::Initialize(IRenderDevice* pDevice)
105104

106105
RefCntAutoPtr<IShader> pVS;
107106
{
108-
ShaderCI.Desc.ShaderType = SHADER_TYPE_VERTEX;
109-
ShaderCI.EntryPoint = "main";
110-
ShaderCI.Desc.Name = "Object vertex shader";
111-
ShaderCI.FilePath = "shaders/object.vsh";
107+
ShaderCI.Desc = {"Object vertex shader", SHADER_TYPE_VERTEX, true};
108+
ShaderCI.EntryPoint = "main";
109+
ShaderCI.FilePath = "shaders/object.vsh";
112110
pDevice->CreateShader(ShaderCI, &pVS);
113111
VERIFY(pVS, "Failed to create object vertex shader");
114112
}
115113

116114
RefCntAutoPtr<IShader> pPS;
117115
{
118-
ShaderCI.Desc.ShaderType = SHADER_TYPE_PIXEL;
119-
ShaderCI.EntryPoint = "main";
120-
ShaderCI.Desc.Name = "Object fragment shader";
121-
ShaderCI.FilePath = "shaders/object.psh";
116+
ShaderCI.Desc = {"Object fragment shader", SHADER_TYPE_PIXEL, true};
117+
ShaderCI.EntryPoint = "main";
118+
ShaderCI.FilePath = "shaders/object.psh";
122119
pDevice->CreateShader(ShaderCI, &pPS);
123120
VERIFY(pPS, "Failed to create object fragment shader");
124121
}

‎Android/HelloAR/src/main/cpp/PlaneRenderer.cc‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,7 @@ void PlaneRenderer::Initialize(IRenderDevice* pDevice)
8787
RT0.BlendOp = BLEND_OPERATION_ADD;
8888

8989
ShaderCreateInfo ShaderCI;
90-
ShaderCI.SourceLanguage = SHADER_SOURCE_LANGUAGE_HLSL;
91-
ShaderCI.UseCombinedTextureSamplers = true;
90+
ShaderCI.SourceLanguage = SHADER_SOURCE_LANGUAGE_HLSL;
9291

9392
// Create a shader source stream factory to load shaders from files.
9493
RefCntAutoPtr<IShaderSourceInputStreamFactory> pShaderSourceFactory;
@@ -97,20 +96,18 @@ void PlaneRenderer::Initialize(IRenderDevice* pDevice)
9796

9897
RefCntAutoPtr<IShader> pVS;
9998
{
100-
ShaderCI.Desc.ShaderType = SHADER_TYPE_VERTEX;
101-
ShaderCI.EntryPoint = "main";
102-
ShaderCI.Desc.Name = "Plane vertex shader";
103-
ShaderCI.FilePath = "shaders/plane.vsh";
99+
ShaderCI.Desc = {"Plane vertex shader", SHADER_TYPE_VERTEX, true};
100+
ShaderCI.EntryPoint = "main";
101+
ShaderCI.FilePath = "shaders/plane.vsh";
104102
pDevice->CreateShader(ShaderCI, &pVS);
105103
VERIFY(pVS, "Failed to create plane vertex shader");
106104
}
107105

108106
RefCntAutoPtr<IShader> pPS;
109107
{
110-
ShaderCI.Desc.ShaderType = SHADER_TYPE_PIXEL;
111-
ShaderCI.EntryPoint = "main";
112-
ShaderCI.Desc.Name = "Object fragment shader";
113-
ShaderCI.FilePath = "shaders/plane.psh";
108+
ShaderCI.Desc = {"Plane fragment shader", SHADER_TYPE_PIXEL, true};
109+
ShaderCI.EntryPoint = "main";
110+
ShaderCI.FilePath = "shaders/plane.psh";
114111
pDevice->CreateShader(ShaderCI, &pPS);
115112
VERIFY(pPS, "Failed to create plane fragment shader");
116113
}

‎Android/HelloAR/src/main/cpp/PointCloudRenderer.cc‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -122,25 +122,22 @@ void PointCloudRenderer::Initialize(IRenderDevice* pDevice)
122122
PSOCreateInfo.GraphicsPipeline.DepthStencilDesc.DepthWriteEnable = False;
123123

124124
ShaderCreateInfo ShaderCI;
125-
ShaderCI.SourceLanguage = SHADER_SOURCE_LANGUAGE_HLSL;
126-
ShaderCI.UseCombinedTextureSamplers = true;
125+
ShaderCI.SourceLanguage = SHADER_SOURCE_LANGUAGE_HLSL;
127126

128127
RefCntAutoPtr<IShader> pVS;
129128
{
130-
ShaderCI.Desc.ShaderType = SHADER_TYPE_VERTEX;
131-
ShaderCI.EntryPoint = "main";
132-
ShaderCI.Desc.Name = "Point cloud vertex shader";
133-
ShaderCI.Source = kVertexShaderSource;
129+
ShaderCI.Desc = {"Point cloud vertex shader", SHADER_TYPE_VERTEX, true};
130+
ShaderCI.EntryPoint = "main";
131+
ShaderCI.Source = kVertexShaderSource;
134132
pDevice->CreateShader(ShaderCI, &pVS);
135133
VERIFY(pVS, "Failed to create point cloud vertex shader");
136134
}
137135

138136
RefCntAutoPtr<IShader> pPS;
139137
{
140-
ShaderCI.Desc.ShaderType = SHADER_TYPE_PIXEL;
141-
ShaderCI.EntryPoint = "main";
142-
ShaderCI.Desc.Name = "Point cloud fragment shader";
143-
ShaderCI.Source = kFragmentShaderSource;
138+
ShaderCI.Desc = {"Point cloud fragment shader", SHADER_TYPE_PIXEL, true};
139+
ShaderCI.EntryPoint = "main";
140+
ShaderCI.Source = kFragmentShaderSource;
144141
pDevice->CreateShader(ShaderCI, &pPS);
145142
VERIFY(pPS, "Failed to create point cloud fragment shader");
146143
}

‎Samples/Asteroids/src/asteroids_DE.cpp‎

Lines changed: 9 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -326,13 +326,11 @@ Asteroids::Asteroids(const Settings& settings, AsteroidsSimulation* asteroids, G
326326
RefCntAutoPtr<IShader> vs, ps;
327327
{
328328
ShaderCreateInfo attribs;
329-
attribs.Desc.ShaderType = SHADER_TYPE_VERTEX;
330-
attribs.Desc.Name = "Asteroids VS";
329+
attribs.Desc = {"Asteroids VS", SHADER_TYPE_VERTEX, true};
331330
attribs.EntryPoint = "asteroid_vs_diligent";
332331
attribs.FilePath = "asteroid_vs_diligent.vsh";
333332
attribs.SourceLanguage = SHADER_SOURCE_LANGUAGE_HLSL;
334333
attribs.pShaderSourceStreamFactory = pShaderSourceFactory;
335-
attribs.UseCombinedTextureSamplers = true;
336334

337335
ShaderMacro Macros[] = {{"BINDLESS", "1"}, {}};
338336
if (m_BindingMode == BindingMode::Bindless)
@@ -343,12 +341,10 @@ Asteroids::Asteroids(const Settings& settings, AsteroidsSimulation* asteroids, G
343341

344342
{
345343
ShaderCreateInfo attribs;
346-
attribs.Desc.ShaderType = SHADER_TYPE_PIXEL;
347-
attribs.Desc.Name = "Asteroids PS";
344+
attribs.Desc = {"Asteroids PS", SHADER_TYPE_PIXEL, true};
348345
attribs.EntryPoint = "asteroid_ps_diligent";
349346
attribs.FilePath = "asteroid_ps_diligent.psh";
350347
attribs.pShaderSourceStreamFactory = pShaderSourceFactory;
351-
attribs.UseCombinedTextureSamplers = true;
352348
attribs.SourceLanguage = SHADER_SOURCE_LANGUAGE_HLSL;
353349

354350
ShaderMacro Macros[] = {{"BINDLESS", "1"}, {}};
@@ -460,19 +456,16 @@ Asteroids::Asteroids(const Settings& settings, AsteroidsSimulation* asteroids, G
460456

461457
RefCntAutoPtr<IShader> vs, ps;
462458
ShaderCreateInfo attribs;
463-
attribs.Desc.ShaderType = SHADER_TYPE_VERTEX;
464-
attribs.Desc.Name = "Skybox VS";
459+
attribs.Desc = {"Skybox VS", SHADER_TYPE_VERTEX, true};
465460
attribs.EntryPoint = "skybox_vs";
466461
attribs.FilePath = "skybox_vs.vsh";
467462
attribs.SourceLanguage = SHADER_SOURCE_LANGUAGE_HLSL;
468-
attribs.UseCombinedTextureSamplers = true;
469463
attribs.pShaderSourceStreamFactory = pShaderSourceFactory;
470464
mDevice->CreateShader(attribs, &vs);
471465

472-
attribs.Desc.Name = "Skybox PS";
473-
attribs.EntryPoint = "skybox_ps";
474-
attribs.FilePath = "skybox_ps.psh";
475-
attribs.Desc.ShaderType = SHADER_TYPE_PIXEL;
466+
attribs.Desc = {"Skybox PS", SHADER_TYPE_PIXEL, true};
467+
attribs.EntryPoint = "skybox_ps";
468+
attribs.FilePath = "skybox_ps.psh";
476469
mDevice->CreateShader(attribs, &ps);
477470

478471
GraphicsPipelineStateCreateInfo PSOCreateInfo;
@@ -570,36 +563,30 @@ Asteroids::Asteroids(const Settings& settings, AsteroidsSimulation* asteroids, G
570563
RefCntAutoPtr<IShader> sprite_vs, sprite_ps, font_ps;
571564
{
572565
ShaderCreateInfo attribs;
573-
attribs.Desc.ShaderType = SHADER_TYPE_VERTEX;
574-
attribs.Desc.Name = "Sprite VS";
566+
attribs.Desc = {"Sprite VS", SHADER_TYPE_VERTEX, true};
575567
attribs.EntryPoint = "sprite_vs";
576568
attribs.FilePath = "sprite_vs.vsh";
577569
attribs.SourceLanguage = SHADER_SOURCE_LANGUAGE_HLSL;
578-
attribs.UseCombinedTextureSamplers = true;
579570
attribs.pShaderSourceStreamFactory = pShaderSourceFactory;
580571
mDevice->CreateShader(attribs, &sprite_vs);
581572
}
582573

583574
{
584575
ShaderCreateInfo attribs;
585-
attribs.Desc.ShaderType = SHADER_TYPE_PIXEL;
586-
attribs.Desc.Name = "Sprite PS";
576+
attribs.Desc = {"Sprite PS", SHADER_TYPE_PIXEL, true};
587577
attribs.EntryPoint = "sprite_ps";
588578
attribs.FilePath = "sprite_ps.psh";
589579
attribs.SourceLanguage = SHADER_SOURCE_LANGUAGE_HLSL;
590-
attribs.UseCombinedTextureSamplers = true;
591580
attribs.pShaderSourceStreamFactory = pShaderSourceFactory;
592581
mDevice->CreateShader(attribs, &sprite_ps);
593582
}
594583

595584
{
596585
ShaderCreateInfo attribs;
597-
attribs.Desc.ShaderType = SHADER_TYPE_PIXEL;
598-
attribs.Desc.Name = "Font PS";
586+
attribs.Desc = {"Font PS", SHADER_TYPE_PIXEL, true};
599587
attribs.EntryPoint = "font_ps";
600588
attribs.FilePath = "font_ps.psh";
601589
attribs.SourceLanguage = SHADER_SOURCE_LANGUAGE_HLSL;
602-
attribs.UseCombinedTextureSamplers = true;
603590
attribs.pShaderSourceStreamFactory = pShaderSourceFactory;
604591
mDevice->CreateShader(attribs, &font_ps);
605592
}

‎Samples/Atmosphere/assets/render_states/RenderStates.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
"Defaults": {
33
"Shader": {
44
"SourceLanguage": "HLSL",
5-
"UseCombinedTextureSamplers": true
5+
"Desc": {
6+
"UseCombinedTextureSamplers": true
7+
}
68
}
79
},
810
"Pipelines": [

‎Samples/GLFWDemo/assets/RenderStates.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
"Defaults": {
33
"Shader": {
44
"SourceLanguage": "HLSL",
5-
"UseCombinedTextureSamplers": true
5+
"Desc": {
6+
"UseCombinedTextureSamplers": true
7+
}
68
},
79
"Pipeline": {
810
"PSODesc": {

‎Samples/GLTFViewer/assets/render_states/RenderStates.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
"Defaults": {
33
"Shader": {
44
"SourceLanguage": "HLSL",
5-
"UseCombinedTextureSamplers": true
5+
"Desc": {
6+
"UseCombinedTextureSamplers": true
7+
}
68
}
79
},
810
"Pipelines": [

‎Samples/NuklearDemo/src/NkDiligent.cpp‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -195,24 +195,21 @@ NK_API struct nk_diligent_context* nk_diligent_init(IRenderDevice* device,
195195
GraphicsPipeline.PrimitiveTopology = PRIMITIVE_TOPOLOGY_TRIANGLE_LIST;
196196

197197
ShaderCreateInfo ShaderCI;
198-
ShaderCI.UseCombinedTextureSamplers = True;
199-
ShaderCI.SourceLanguage = SHADER_SOURCE_LANGUAGE_HLSL;
198+
ShaderCI.SourceLanguage = SHADER_SOURCE_LANGUAGE_HLSL;
200199

201200
RefCntAutoPtr<IShader> pVS;
202201
{
203-
ShaderCI.Desc.ShaderType = SHADER_TYPE_VERTEX;
204-
ShaderCI.Desc.Name = "Nuklear VS";
205-
ShaderCI.EntryPoint = "vs";
206-
ShaderCI.Source = NuklearVertexShaderSource;
202+
ShaderCI.Desc = {"Nuklear VS", SHADER_TYPE_VERTEX, true};
203+
ShaderCI.EntryPoint = "vs";
204+
ShaderCI.Source = NuklearVertexShaderSource;
207205
device->CreateShader(ShaderCI, &pVS);
208206
}
209207

210208
RefCntAutoPtr<IShader> pPS;
211209
{
212-
ShaderCI.Desc.ShaderType = SHADER_TYPE_PIXEL;
213-
ShaderCI.Desc.Name = "Nuklear PS";
214-
ShaderCI.EntryPoint = "ps";
215-
ShaderCI.Source = NuklearPixelShaderSource;
210+
ShaderCI.Desc = {"Nuklear PS", SHADER_TYPE_PIXEL, true};
211+
ShaderCI.EntryPoint = "ps";
212+
ShaderCI.Source = NuklearPixelShaderSource;
216213
device->CreateShader(ShaderCI, &pPS);
217214
}
218215

‎Samples/Shadows/assets/render_states/RenderStates.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
"Defaults": {
33
"Shader": {
44
"SourceLanguage": "HLSL",
5-
"UseCombinedTextureSamplers": true
5+
"Desc": {
6+
"UseCombinedTextureSamplers": true
7+
}
68
}
79
},
810
"Shaders": [

0 commit comments

Comments
 (0)