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;