diff --git a/README.md b/README.md index b7efabcad..93a9a018b 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Supported rendering backends: Supported HMD: - * OculusVR (0.4.3) + * OculusVR (0.4.4) Supported platforms: diff --git a/src/ovr.cpp b/src/ovr.cpp index e01ee30e3..9f80085c3 100644 --- a/src/ovr.cpp +++ b/src/ovr.cpp @@ -48,7 +48,7 @@ namespace bgfx case ovrRenderAPI_D3D9: { ovrD3D9ConfigData* data = (ovrD3D9ConfigData*)_config; - m_rtSize = data->Header.RTSize; + m_rtSize = data->Header.BackBufferSize; } break; #endif // BGFX_CONFIG_RENDERER_DIRECT3D9 @@ -57,7 +57,7 @@ namespace bgfx case ovrRenderAPI_D3D11: { ovrD3D11ConfigData* data = (ovrD3D11ConfigData*)_config; - m_rtSize = data->Header.RTSize; + m_rtSize = data->Header.BackBufferSize; } break; #endif // BGFX_CONFIG_RENDERER_DIRECT3D11 @@ -66,7 +66,7 @@ namespace bgfx case ovrRenderAPI_OpenGL: { ovrGLConfigData* data = (ovrGLConfigData*)_config; - m_rtSize = data->Header.RTSize; + m_rtSize = data->Header.BackBufferSize; } break; #endif // BGFX_CONFIG_RENDERER_OPENGL diff --git a/src/renderer_d3d11.cpp b/src/renderer_d3d11.cpp index ed2353e10..e17a31417 100644 --- a/src/renderer_d3d11.cpp +++ b/src/renderer_d3d11.cpp @@ -1857,8 +1857,8 @@ RENDERDOC_IMPORT { ovrD3D11Config config; config.D3D11.Header.API = ovrRenderAPI_D3D11; - config.D3D11.Header.RTSize.w = m_scd.BufferDesc.Width; - config.D3D11.Header.RTSize.h = m_scd.BufferDesc.Height; + config.D3D11.Header.BackBufferSize.w = m_scd.BufferDesc.Width; + config.D3D11.Header.BackBufferSize.h = m_scd.BufferDesc.Height; config.D3D11.Header.Multisample = 0; config.D3D11.pDevice = m_device; config.D3D11.pDeviceContext = m_deviceCtx; diff --git a/src/renderer_gl.cpp b/src/renderer_gl.cpp index b6a088579..84578af6e 100644 --- a/src/renderer_gl.cpp +++ b/src/renderer_gl.cpp @@ -1961,8 +1961,8 @@ namespace bgfx { ovrGLConfig config; config.OGL.Header.API = ovrRenderAPI_OpenGL; - config.OGL.Header.RTSize.w = m_resolution.m_width; - config.OGL.Header.RTSize.h = m_resolution.m_height; + config.OGL.Header.BackBufferSize.w = m_resolution.m_width; + config.OGL.Header.BackBufferSize.h = m_resolution.m_height; config.OGL.Header.Multisample = 0; config.OGL.Window = g_bgfxHwnd; config.OGL.DC = GetDC(g_bgfxHwnd); diff --git a/tools/shaderc/shaderc_dx11.cpp b/tools/shaderc/shaderc_dx11.cpp index 1f23d6d20..b61b0db93 100644 --- a/tools/shaderc/shaderc_dx11.cpp +++ b/tools/shaderc/shaderc_dx11.cpp @@ -43,7 +43,7 @@ const RemapInputSemantic& findInputSemantic(const char* _name, uint8_t _index) { const RemapInputSemantic& ris = s_remapInputSemantic[ii]; if (0 == strcmp(ris.m_name, _name) - && ris.m_index == _index) + && ris.m_index == _index) { return ris; } @@ -79,7 +79,7 @@ UniformType::Enum findUniformTypeDx11(const D3D11_SHADER_TYPE_DESC& constDesc) const UniformRemapDx11& remap = s_constRemapDx11[ii]; if (remap.paramClass == constDesc.Class - && remap.paramType == constDesc.Type) + && remap.paramType == constDesc.Type) { if (D3D_SVC_MATRIX_COLUMNS != constDesc.Class) { @@ -87,7 +87,7 @@ UniformType::Enum findUniformTypeDx11(const D3D11_SHADER_TYPE_DESC& constDesc) } if (remap.columns == constDesc.Columns - && remap.rows == constDesc.Rows) + && remap.rows == constDesc.Rows) { return remap.id; } @@ -175,7 +175,7 @@ bool compileHLSLShaderDx11(bx::CommandLine& _cmdLine, const std::string& _code, , &errorMsg ); if (FAILED(hr) - || (werror && NULL != errorMsg) ) + || (werror && NULL != errorMsg) ) { const char* log = (char*)errorMsg->GetBufferPointer(); @@ -185,7 +185,7 @@ bool compileHLSLShaderDx11(bx::CommandLine& _cmdLine, const std::string& _code, int32_t end = INT32_MAX; if (2 == sscanf(log, "(%u,%u):", &line, &column) - && 0 != line) + && 0 != line) { start = bx::uint32_imax(1, line-10); end = start + 20; @@ -293,7 +293,7 @@ bool compileHLSLShaderDx11(bx::CommandLine& _cmdLine, const std::string& _code, UniformType::Enum type = findUniformTypeDx11(constDesc); if (UniformType::Count != type - && 0 != (varDesc.uFlags & D3D_SVF_USED) ) + && 0 != (varDesc.uFlags & D3D_SVF_USED) ) { Uniform un; un.name = varDesc.Name; diff --git a/tools/shaderc/shaderc_dx9.cpp b/tools/shaderc/shaderc_dx9.cpp index 6158a3d52..f04c8efad 100644 --- a/tools/shaderc/shaderc_dx9.cpp +++ b/tools/shaderc/shaderc_dx9.cpp @@ -41,7 +41,7 @@ UniformType::Enum findUniformTypeDx9(const D3DXCONSTANT_DESC& constDesc) const UniformRemapDx9& remap = s_constRemapDx9[ii]; if (remap.paramClass == constDesc.Class - && remap.paramType == constDesc.Type) + && remap.paramType == constDesc.Type) { if (D3DXPC_MATRIX_COLUMNS != constDesc.Class) { @@ -49,7 +49,7 @@ UniformType::Enum findUniformTypeDx9(const D3DXCONSTANT_DESC& constDesc) } if (remap.columns == constDesc.Columns - && remap.rows == constDesc.Rows) + && remap.rows == constDesc.Rows) { return remap.id; } @@ -157,7 +157,7 @@ bool compileHLSLShaderDx9(bx::CommandLine& _cmdLine, const std::string& _code, b int32_t end = INT32_MAX; if (3 == sscanf(log, "%[^(](%u,%u):", source, &line, &column) - && 0 != line) + && 0 != line) { start = bx::uint32_imax(1, line-10); end = start + 20; diff --git a/tools/shaderc/shaderc_glsl.cpp b/tools/shaderc/shaderc_glsl.cpp index c122e8820..56fa2efe0 100644 --- a/tools/shaderc/shaderc_glsl.cpp +++ b/tools/shaderc/shaderc_glsl.cpp @@ -43,7 +43,7 @@ bool compileGLSLShader(bx::CommandLine& _cmdLine, uint32_t _gles, const std::str int32_t end = INT32_MAX; if (3 == sscanf(log, "%u:%u(%u):", &source, &line, &column) - && 0 != line) + && 0 != line) { start = bx::uint32_imax(1, line-10); end = start + 20; @@ -95,7 +95,7 @@ bool compileGLSLShader(bx::CommandLine& _cmdLine, uint32_t _gles, const std::str parse = bx::strws(bx::strword(parse) ); if (0 == strncmp(qualifier, "attribute", 9) - || 0 == strncmp(qualifier, "varying", 7) ) + || 0 == strncmp(qualifier, "varying", 7) ) { // skip attributes and varyings. parse = eol + 1; @@ -113,8 +113,8 @@ bool compileGLSLShader(bx::CommandLine& _cmdLine, uint32_t _gles, const std::str const char* type = parse; if (0 == strncmp(type, "lowp", 4) - || 0 == strncmp(type, "mediump", 7) - || 0 == strncmp(type, "highp", 5) ) + || 0 == strncmp(type, "mediump", 7) + || 0 == strncmp(type, "highp", 5) ) { precision = type; type = parse = bx::strws(bx::strword(parse) );