Răsfoiți Sursa

Fixed ovr compiling with srgb and DX9 removed.

OTHGMars 8 ani în urmă
părinte
comite
b5cc06cc8b

+ 1 - 1
Engine/source/platform/input/openVR/openVROverlay.cpp

@@ -29,7 +29,7 @@ OpenVROverlay::OpenVROverlay()
    mOverlayWidth = 1.5f;
    mOverlayFlags = 0;
 
-   mOverlayColor = ColorF(1, 1, 1, 1);
+   mOverlayColor = LinearColorF(1, 1, 1, 1);
    mTrackingOrigin = vr::TrackingUniverseSeated;
 
    mTargetFormat = GFXFormatR8G8B8A8_LINEAR_FORCE; // needed for openvr!

+ 1 - 1
Engine/source/platform/input/openVR/openVROverlay.h

@@ -53,7 +53,7 @@ public:
 
    GFXTexHandle mStagingTexture; ///< Texture used by openvr
 
-   ColorF mOverlayColor;
+   LinearColorF mOverlayColor;
 
    bool mOverlayTypeDirty; ///< Overlay type is dirty
    bool mOverlayDirty; ///< Overlay properties are dirty

+ 1 - 11
Engine/source/platform/input/openVR/openVRProvider.cpp

@@ -18,11 +18,6 @@
 #include "gfx/D3D11/gfxD3D11EnumTranslate.h"
 #include "gfx/gfxStringEnumTranslate.h"
 
-
-#include "gfx/D3D9/gfxD3D9Device.h"
-#include "gfx/D3D9/gfxD3D9TextureObject.h"
-#include "gfx/D3D9/gfxD3D9EnumTranslate.h"
-
 #include "materials/matTextureTarget.h"
 
 #ifdef TORQUE_OPENGL
@@ -976,11 +971,6 @@ void OpenVRProvider::onEyeRendered(U32 index)
          err = vr::VRCompositor()->Submit((vr::EVREye)(vr::Eye_Right), &eyeTexture, &bounds);
       }
    }
-   else if (GFX->getAdapterType() == Direct3D9)
-   {
-      //vr::Texture_t eyeTexture = { (void*)static_cast<GFXD3D9TextureObject*>(mHMDRenderState.mStereoRenderTextures[index].getPointer())->get2DTex(), vr::API_DirectX, vr::ColorSpace_Gamma };
-      //err = vr::VRCompositor()->Submit((vr::EVREye)(vr::Eye_Left + index), &eyeTexture);
-   }
 #ifdef TORQUE_OPENGL
    else if (GFX->getAdapterType() == OpenGL)
    {
@@ -1496,7 +1486,7 @@ bool OpenVRProvider::getRenderModelTexture(S32 idx, GFXTextureObject **outTex, b
             bmp->writeBitmap("PNG", fs);
             fs.close();
 
-            tex.set(bmp, &GFXDefaultStaticDiffuseProfile, true, "OpenVR Texture");
+            tex.set(bmp, &GFXStaticTextureSRGBProfile, true, "OpenVR Texture");
             //tex.set(loadedTexture.vrTexture->unWidth, loadedTexture.vrTexture->unHeight, 1, (void*)pixels, GFXFormatR8G8B8A8, &GFXDefaultStaticDiffuseProfile, "OpenVR Texture", 1);