diff options
Diffstat (limited to 'LibOVR/Src/CAPI/D3D1X/CAPI_D3D1X_Util.h')
| -rw-r--r-- | LibOVR/Src/CAPI/D3D1X/CAPI_D3D1X_Util.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/LibOVR/Src/CAPI/D3D1X/CAPI_D3D1X_Util.h b/LibOVR/Src/CAPI/D3D1X/CAPI_D3D1X_Util.h index 9aa5e43..497c8e4 100644 --- a/LibOVR/Src/CAPI/D3D1X/CAPI_D3D1X_Util.h +++ b/LibOVR/Src/CAPI/D3D1X/CAPI_D3D1X_Util.h @@ -5,16 +5,16 @@ Content : D3DX 10/11 utility classes for rendering Created : September 10, 2012 Authors : Andrew Reisse -Copyright : Copyright 2014 Oculus VR, Inc. All Rights reserved. +Copyright : Copyright 2014 Oculus VR, LLC All Rights reserved. -Licensed under the Oculus VR Rift SDK License Version 3.1 (the "License"); +Licensed under the Oculus VR Rift SDK License Version 3.2 (the "License"); you may not use the Oculus VR Rift SDK except in compliance with the License, which is provided at the time of installation or download, or which otherwise accompanies this software in either electronic or hard copy form. You may obtain a copy of the License at -http://www.oculusvr.com/licenses/LICENSE-3.1 +http://www.oculusvr.com/licenses/LICENSE-3.2 Unless required by applicable law or agreed to in writing, the Oculus VR SDK distributed under the License is distributed on an "AS IS" BASIS, @@ -346,11 +346,12 @@ public: struct Uniform { const char* Name; - VarType Type; - int Offset, Size; + VarType Type; + int Offset; + int Size; }; - const Uniform* UniformRefl; - size_t UniformReflSize; + const Uniform* UniformRefl; + size_t UniformReflSize; ShaderBase(RenderParams* rp, ShaderStage stage); ~ShaderBase(); @@ -402,7 +403,7 @@ public: bool Dynamic; public: - Buffer(RenderParams* rp) : pParams(rp), Size(0), Use(0) {} + Buffer(RenderParams* rp) : pParams(rp), D3DBuffer(), Size(0), Use(0), Dynamic(false) {} ~Buffer(); ID3D1xBuffer* GetBuffer() const { return D3DBuffer; } |