Mirrors/bgfx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bgfx.git synced 2026-02-21 22:33:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #921 from mendsley/vr_reorg

Browse Source 
Add BX_OVERRIDE directives to new VR classes
This commit is contained in:
Branimir Karadžić
2016-09-16 22:23:56 -07:00
committed by GitHub
parent 7fdbda0430 6ca7205391
commit 85a117374c
3 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/hmd_ovr.h
View File

@@ -35,25 +35,25 @@ namespace bgfx
VRImplOVR();
virtual ~VRImplOVR() = 0;
virtual bool init();
virtual void shutdown();
virtual void connect(VRDesc* _desc);
virtual void disconnect();
virtual bool init() BX_OVERRIDE;
virtual void shutdown() BX_OVERRIDE;
virtual void connect(VRDesc* _desc) BX_OVERRIDE;
virtual void disconnect() BX_OVERRIDE;
virtual bool isConnected() const
virtual bool isConnected() const BX_OVERRIDE
{
return NULL != m_session;
}
virtual bool updateTracking(HMD& _hmd);
virtual void updateInput(HMD& _hmd);
virtual void recenter();
virtual bool updateTracking(HMD& _hmd) BX_OVERRIDE;
virtual void updateInput(HMD& _hmd) BX_OVERRIDE;
virtual void recenter() BX_OVERRIDE;
virtual bool createSwapChain(const VRDesc& _desc, int _msaaSamples, int _mirrorWidth, int _mirrorHeight) = 0;
virtual void destroySwapChain() = 0;
virtual void destroyMirror() = 0;
virtual void renderEyeStart(const VRDesc& _desc, uint8_t _eye) = 0;
virtual bool submitSwapChain(const VRDesc& _desc) = 0;
virtual bool createSwapChain(const VRDesc& _desc, int _msaaSamples, int _mirrorWidth, int _mirrorHeight) BX_OVERRIDE = 0;
virtual void destroySwapChain() BX_OVERRIDE = 0;
virtual void destroyMirror() BX_OVERRIDE = 0;
virtual void renderEyeStart(const VRDesc& _desc, uint8_t _eye) BX_OVERRIDE = 0;
virtual bool submitSwapChain(const VRDesc& _desc) BX_OVERRIDE = 0;
protected:
ovrSession m_session;

10
src/renderer_d3d11.cpp
View File

@@ -611,11 +611,11 @@ namespace bgfx { namespace d3d11
public:
VRImplOVRD3D11();
virtual bool createSwapChain(const VRDesc& _desc, int _msaaSamples, int _mirrorWidth, int _mirrorHeight);
virtual void destroySwapChain();
virtual void destroyMirror();
virtual void renderEyeStart(const VRDesc& _desc, uint8_t _eye);
virtual bool submitSwapChain(const VRDesc& _desc);
virtual bool createSwapChain(const VRDesc& _desc, int _msaaSamples, int _mirrorWidth, int _mirrorHeight) BX_OVERRIDE;
virtual void destroySwapChain() BX_OVERRIDE;
virtual void destroyMirror() BX_OVERRIDE;
virtual void renderEyeStart(const VRDesc& _desc, uint8_t _eye) BX_OVERRIDE;
virtual bool submitSwapChain(const VRDesc& _desc) BX_OVERRIDE;
private:
ID3D11RenderTargetView* m_eyeRtv[2][4];

10
src/renderer_gl.cpp
View File

@@ -1359,11 +1359,11 @@ namespace bgfx { namespace gl
public:
VRImplOVRGL();
virtual bool createSwapChain(const VRDesc& _desc, int _msaaSamples, int _mirrorWidth, int _mirrorHeight);
virtual void destroySwapChain();
virtual void destroyMirror();
virtual void renderEyeStart(const VRDesc& _desc, uint8_t _eye);
virtual bool submitSwapChain(const VRDesc& _desc);
virtual bool createSwapChain(const VRDesc& _desc, int _msaaSamples, int _mirrorWidth, int _mirrorHeight) BX_OVERRIDE;
virtual void destroySwapChain() BX_OVERRIDE;
virtual void destroyMirror() BX_OVERRIDE;
virtual void renderEyeStart(const VRDesc& _desc, uint8_t _eye) BX_OVERRIDE;
virtual bool submitSwapChain(const VRDesc& _desc) BX_OVERRIDE;
private:
GLuint m_eyeFbo[2];