Skip to content

Commit c837cbb

Browse files
Updated API to 240095, fixed compiler warnings-errors
1 parent a1ec169 commit c837cbb

4 files changed

Lines changed: 8 additions & 9 deletions

File tree

.github/workflows/linux.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ jobs:
3535
- name: Configure dependencies
3636
if: success()
3737
run: |
38-
sudo apt-get install build-essential pkg-config libx11-dev libxcursor-dev \
39-
libxinerama-dev libgl1-mesa-dev libglu-dev libasound2-dev libpulse-dev libudev-dev libxi-dev libxrandr-dev yasm
38+
sudo apt-get install build-essential libx11-dev libgl1-mesa-dev
4039
4140
- name: Configure CMake
4241
if: success()
@@ -96,8 +95,7 @@ jobs:
9695
- name: Configure dependencies
9796
if: success()
9897
run: |
99-
sudo apt-get install build-essential pkg-config libx11-dev libxcursor-dev \
100-
libxinerama-dev libgl1-mesa-dev libglu-dev libasound2-dev libpulse-dev libudev-dev libxi-dev libxrandr-dev yasm
98+
sudo apt-get install build-essential libx11-dev libgl1-mesa-dev
10199
102100
- name: Configure CMake
103101
if: success()

HLSL2GLSLConverter/src/HLSL2GLSLConverterApp.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class HLSL2GLSLConverterApp
4545
int ParseCmdLine(int argc, char** argv);
4646
int Convert(IRenderDevice* pDevice);
4747

48-
const bool NeedsCompileShader() const
48+
bool NeedsCompileShader() const
4949
{
5050
return m_CompileShader;
5151
}

Imgui/src/ImGuiDiligentRenderer.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -319,13 +319,13 @@ void ImGuiDiligentRenderer::CreateDeviceObjects()
319319
ShaderCI.UseCombinedTextureSamplers = true;
320320
ShaderCI.SourceLanguage = SHADER_SOURCE_LANGUAGE_DEFAULT;
321321

322-
const auto& deviceCaps = m_pDevice->GetDeviceCaps();
322+
const auto DeviceType = m_pDevice->GetDeviceInfo().Type;
323323

324324
RefCntAutoPtr<IShader> pVS;
325325
{
326326
ShaderCI.Desc.ShaderType = SHADER_TYPE_VERTEX;
327327
ShaderCI.Desc.Name = "Imgui VS";
328-
switch (deviceCaps.DevType)
328+
switch (DeviceType)
329329
{
330330
case RENDER_DEVICE_TYPE_VULKAN:
331331
ShaderCI.ByteCode = VertexShader_SPIRV;
@@ -357,7 +357,7 @@ void ImGuiDiligentRenderer::CreateDeviceObjects()
357357
{
358358
ShaderCI.Desc.ShaderType = SHADER_TYPE_PIXEL;
359359
ShaderCI.Desc.Name = "Imgui PS";
360-
switch (deviceCaps.DevType)
360+
switch (DeviceType)
361361
{
362362
case RENDER_DEVICE_TYPE_VULKAN:
363363
ShaderCI.ByteCode = FragmentShader_SPIRV;

NativeApp/src/Linux/LinuxMain.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,8 @@ int x_main()
453453
KeySym keysym;
454454
char buffer[80];
455455
int num_char = XLookupString((XKeyEvent*)&xev, buffer, _countof(buffer), &keysym, 0);
456-
EscPressed = (keysym == XK_Escape);
456+
(void)num_char;
457+
EscPressed = (keysym == XK_Escape);
457458
}
458459

459460
case ConfigureNotify:

0 commit comments

Comments
 (0)