From 7650df5525d4c00df8d9e794c1ef3074b8d30de4 Mon Sep 17 00:00:00 2001 From: jp9000 Date: Mon, 9 Feb 2015 01:05:01 -0800 Subject: [PATCH] libobs-d3d11: Fill out switch enum values When using an enumeration value with a switch, it needs to be filled out with all possible values to prevent compiler warnings. This warning is used to prevent the developer from unintentionally forgetting to add new enum values to any switches the enum is used on later on. Sadly, only good compilers actually have this warning (mingw). --- libobs-d3d11/d3d11-shader.cpp | 8 +++++++- libobs-d3d11/d3d11-subsystem.hpp | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/libobs-d3d11/d3d11-shader.cpp b/libobs-d3d11/d3d11-shader.cpp index 690e6c2a9..0c6a5065c 100644 --- a/libobs-d3d11/d3d11-shader.cpp +++ b/libobs-d3d11/d3d11-shader.cpp @@ -135,7 +135,13 @@ void gs_shader::BuildConstantBuffer() case GS_SHADER_PARAM_VEC2: size = sizeof(vec2); break; case GS_SHADER_PARAM_VEC3: size = sizeof(float)*3; break; case GS_SHADER_PARAM_VEC4: size = sizeof(vec4); break; - case GS_SHADER_PARAM_MATRIX4X4: size = sizeof(float)*4*4; + case GS_SHADER_PARAM_MATRIX4X4: + size = sizeof(float)*4*4; + break; + case GS_SHADER_PARAM_TEXTURE: + case GS_SHADER_PARAM_STRING: + case GS_SHADER_PARAM_UNKNOWN: + continue; } /* checks to see if this constant needs to start at a new diff --git a/libobs-d3d11/d3d11-subsystem.hpp b/libobs-d3d11/d3d11-subsystem.hpp index 619509027..a1f073400 100644 --- a/libobs-d3d11/d3d11-subsystem.hpp +++ b/libobs-d3d11/d3d11-subsystem.hpp @@ -59,6 +59,7 @@ static inline uint32_t GetWinVer() static inline DXGI_FORMAT ConvertGSTextureFormat(gs_color_format format) { switch (format) { + case GS_UNKNOWN: return DXGI_FORMAT_UNKNOWN; case GS_A8: return DXGI_FORMAT_A8_UNORM; case GS_R8: return DXGI_FORMAT_R8_UNORM; case GS_RGBA: return DXGI_FORMAT_R8G8B8A8_UNORM; @@ -109,6 +110,7 @@ static inline gs_color_format ConvertDXGITextureFormat(DXGI_FORMAT format) static inline DXGI_FORMAT ConvertGSZStencilFormat(gs_zstencil_format format) { switch (format) { + case GS_ZS_NONE: return DXGI_FORMAT_UNKNOWN; case GS_Z16: return DXGI_FORMAT_D16_UNORM; case GS_Z24_S8: return DXGI_FORMAT_D24_UNORM_S8_UINT; case GS_Z32F: return DXGI_FORMAT_D32_FLOAT;