Commit: d8e83d6c3af9eaec14cdbe1eaa7f993aec7a282c - OgreHotshotServer (hg)

Commit MetaInfo

• Revisión: d8e83d6c3af9eaec14cdbe1eaa7f993aec7a282c (tree)
• Tiempo: 2019-09-16 12:52:40
• Autor: Matias N. Goldberg <dark_ <sylinc@yaho...>
• Commiter: Matias N. Goldberg <dark_

Log Message

Ported radial density mask to D3D11
Bugfix: RdmMedium quality behaving like RdmLow

Cambiar Resumen

• modified: OgreMain/src/OgreRadialDensityMask.cpp
• modified: Samples/2.0/Tutorials/Tutorial_OpenVR/Tutorial_OpenVR.cpp
• modified: Samples/Media/2.0/scripts/materials/Common/GLSL/RadialDensityMask_ps.glsl
• modified: Samples/Media/Compute/VR/Foveated/RadialDensityMaskReconstruct_cs.glsl
• modified: Samples/Media/Compute/VR/Foveated/RadialDensityMaskReconstruct_cs.hlsl
• modified: Samples/Media/Compute/VR/Foveated/RadialDensityMaskReconstruct_piece_cs.any
• add: Samples/Media/2.0/scripts/materials/Common/HLSL/RadialDensityMask_ps.hlsl
• add: Samples/Media/2.0/scripts/materials/Common/HLSL/RadialDensityMask_vs.hlsl

Diferencia incremental

diff -r ff49d8a38e01 -r d8e83d6c3af9 OgreMain/src/OgreRadialDensityMask.cpp
--- a/OgreMain/src/OgreRadialDensityMask.cpp	Mon Sep 16 00:09:07 2019 -0300
+++ b/OgreMain/src/OgreRadialDensityMask.cpp	Mon Sep 16 00:52:40 2019 -0300
@@ -240,7 +240,7 @@
         mReconstructJob->setPiece( "Quality", qualityStr[quality] );
         for( int32 i = 0; i < 3; ++i )
             mReconstructJob->setProperty( qualityProp[i], i + 1 );
-        mReconstructJob->setProperty( "quality", static_cast<int32>( quality ) );
+        mReconstructJob->setProperty( "quality", static_cast<int32>( quality ) + 1 );
     }
     //-------------------------------------------------------------------------
     void RadialDensityMask::setEyesCenter( const Vector2 &leftEyeCenter, const Vector2 &rightEyeCenter )

diff -r ff49d8a38e01 -r d8e83d6c3af9 Samples/2.0/Tutorials/Tutorial_OpenVR/Tutorial_OpenVR.cpp
--- a/Samples/2.0/Tutorials/Tutorial_OpenVR/Tutorial_OpenVR.cpp	Mon Sep 16 00:09:07 2019 -0300
+++ b/Samples/2.0/Tutorials/Tutorial_OpenVR/Tutorial_OpenVR.cpp	Mon Sep 16 00:52:40 2019 -0300
@@ -140,9 +140,11 @@
         mHMD->GetRecommendedRenderTargetSize( &width, &height );
 
         Ogre::TextureGpuManager *textureManager = mRoot->getRenderSystem()->getTextureGpuManager();
+        //Radial Density Mask requires the VR texture to be UAV & reinterpretable
         mVrTexture = textureManager->createOrRetrieveTexture( "OpenVR Both Eyes",
                                                               Ogre::GpuPageOutStrategy::Discard,
                                                               Ogre::TextureFlags::RenderToTexture |
+                                                              Ogre::TextureFlags::Uav |
                                                               Ogre::TextureFlags::Reinterpretable,
                                                               Ogre::TextureTypes::Type2D );
         mVrTexture->setResolution( width << 1u, height );

diff -r ff49d8a38e01 -r d8e83d6c3af9 Samples/Media/2.0/scripts/materials/Common/GLSL/RadialDensityMask_ps.glsl
--- a/Samples/Media/2.0/scripts/materials/Common/GLSL/RadialDensityMask_ps.glsl	Mon Sep 16 00:09:07 2019 -0300
+++ b/Samples/Media/2.0/scripts/materials/Common/GLSL/RadialDensityMask_ps.glsl	Mon Sep 16 00:52:40 2019 -0300
@@ -35,5 +35,5 @@
 	else if( !((iFragCoordHalf.x & 0x03u) != 0u || (iFragCoordHalf.y & 0x03u) != 0u) )
 		discard;
 
-	fragColour = vec4( 0 );
+	fragColour = float4( 0, 0, 0, 0 );
 }

diff -r ff49d8a38e01 -r d8e83d6c3af9 Samples/Media/2.0/scripts/materials/Common/HLSL/RadialDensityMask_ps.hlsl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Samples/Media/2.0/scripts/materials/Common/HLSL/RadialDensityMask_ps.hlsl	Mon Sep 16 00:52:40 2019 -0300
@@ -0,0 +1,35 @@
+
+#define p_leftEyeCenter			leftEyeCenter_rightEyeCenter.xy
+#define p_rightEyeCenter		leftEyeCenter_rightEyeCenter.zw
+#define p_rightEyeStart			rightEyeStart_radius.x
+#define p_radius				rightEyeStart_radius.yzw
+#define p_invBlockResolution	invBlockResolution
+
+float4 main
+(
+	float4 gl_FragCoord : SV_Position,
+
+	uniform float4 rightEyeStart_radius,
+	uniform float4 leftEyeCenter_rightEyeCenter,
+	uniform float2 invBlockResolution
+) : SV_Target
+{
+	float2 eyeCenter = gl_FragCoord.x >= p_rightEyeStart ? p_rightEyeCenter : p_leftEyeCenter;
+
+	//We must work in blocks so the reconstruction filter can work properly
+	float2 toCenter = trunc(gl_FragCoord.xy * 0.125f) * p_invBlockResolution.xy - eyeCenter;
+	toCenter.x *= 2.0f; //Twice because of stereo (each eye is half the size of the full res)
+	float distToCenter = length( toCenter );
+
+	uint2 iFragCoordHalf = uint2( gl_FragCoord.xy * 0.5f );
+	if( distToCenter < p_radius.x )
+		discard;
+	else if( (iFragCoordHalf.x & 0x01u) == (iFragCoordHalf.y & 0x01u) && distToCenter < p_radius.y )
+		discard;
+	else if( !((iFragCoordHalf.x & 0x01u) != 0u || (iFragCoordHalf.y & 0x01u) != 0u) && distToCenter < p_radius.z )
+		discard;
+	else if( !((iFragCoordHalf.x & 0x03u) != 0u || (iFragCoordHalf.y & 0x03u) != 0u) )
+		discard;
+
+	return float4( 0, 0, 0, 0 );
+}

diff -r ff49d8a38e01 -r d8e83d6c3af9 Samples/Media/2.0/scripts/materials/Common/HLSL/RadialDensityMask_vs.hlsl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Samples/Media/2.0/scripts/materials/Common/HLSL/RadialDensityMask_vs.hlsl	Mon Sep 16 00:52:40 2019 -0300
@@ -0,0 +1,31 @@
+struct VS_INPUT
+{
+	float2 vertex	: POSITION;
+	uint vertexId	: SV_VertexID;
+	#define gl_VertexID input.vertexId
+};
+
+struct PS_INPUT
+{
+	float4 gl_Position		: SV_Position;
+	uint gl_ViewportIndex	: SV_ViewportArrayIndex;
+};
+
+PS_INPUT main
+(
+	VS_INPUT input,
+
+	uniform float ogreBaseVertex,
+	uniform float2 rsDepthRange,
+	uniform matrix worldViewProj
+)
+{
+	PS_INPUT outVs;
+
+	outVs.gl_Position.xy= mul( worldViewProj, float4( input.vertex.xy, 0.0f, 1.0f ) ).xy;
+	outVs.gl_Position.z = rsDepthRange.x;
+	outVs.gl_Position.w = 1.0f;
+	outVs.gl_ViewportIndex = gl_VertexID >= (3 * 4) ? 1 : 0;
+
+	return outVs;
+}

diff -r ff49d8a38e01 -r d8e83d6c3af9 Samples/Media/Compute/VR/Foveated/RadialDensityMaskReconstruct_cs.glsl
--- a/Samples/Media/Compute/VR/Foveated/RadialDensityMaskReconstruct_cs.glsl	Mon Sep 16 00:09:07 2019 -0300
+++ b/Samples/Media/Compute/VR/Foveated/RadialDensityMaskReconstruct_cs.glsl	Mon Sep 16 00:52:40 2019 -0300
@@ -12,6 +12,10 @@
 
 uniform sampler2D srcTex;
 
+layout( local_size_x = @value( threads_per_group_x ),
+		local_size_y = @value( threads_per_group_y ),
+		local_size_z = @value( threads_per_group_z ) ) in;
+
 @insertpiece( HeaderCS )
 
 void main()

diff -r ff49d8a38e01 -r d8e83d6c3af9 Samples/Media/Compute/VR/Foveated/RadialDensityMaskReconstruct_cs.hlsl
--- a/Samples/Media/Compute/VR/Foveated/RadialDensityMaskReconstruct_cs.hlsl	Mon Sep 16 00:09:07 2019 -0300
+++ b/Samples/Media/Compute/VR/Foveated/RadialDensityMaskReconstruct_cs.hlsl	Mon Sep 16 00:52:40 2019 -0300
@@ -15,11 +15,12 @@
 
 #define short2 int2
 #define ushort2 uint2
-#define OGRE_imageWrite3D4( outImage, iuv, value ) outImage[uint2( iuv )] = value
+#define OGRE_imageWrite2D4( outImage, iuv, value ) outImage[uint2( iuv )] = value
 
 RWTexture2D<@insertpiece(uav0_pf_type)> dstTex		: register(u0);
 
-Texture2D srcTex : register(t0);
+Texture2D srcTex				: register(t0);
+SamplerState bilinearSampler	: register(s0);
 
 @insertpiece( HeaderCS )
 

diff -r ff49d8a38e01 -r d8e83d6c3af9 Samples/Media/Compute/VR/Foveated/RadialDensityMaskReconstruct_piece_cs.any
--- a/Samples/Media/Compute/VR/Foveated/RadialDensityMaskReconstruct_piece_cs.any	Mon Sep 16 00:09:07 2019 -0300
+++ b/Samples/Media/Compute/VR/Foveated/RadialDensityMaskReconstruct_piece_cs.any	Mon Sep 16 00:52:40 2019 -0300
@@ -14,10 +14,6 @@
 	#define invBlockResolution		invBlockResolution_invResolution.xy
 	#define invResolution			invBlockResolution_invResolution.zw
 
-	layout( local_size_x = @value( threads_per_group_x ),
-			local_size_y = @value( threads_per_group_y ),
-			local_size_z = @value( threads_per_group_z ) ) in;
-
 	@insertpiece( DeclSRgbFuncs )
 
 	/** Takes the pattern (low quality):