From: Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
Date: Tue, 8 Oct 2019 13:32:00 +0000 (+0200)
Subject: debug
X-Git-Tag: v0.1.21~27
X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=6e52a9134cc7d65a97591344c47b8426d710eb46;p=jp%2Fvke.net.git

debug
---

diff --git a/addons/DistanceFieldFont/DistanceFieldFont.csproj b/addons/DistanceFieldFont/DistanceFieldFont.csproj
index 676196f..93faa27 100644
--- a/addons/DistanceFieldFont/DistanceFieldFont.csproj
+++ b/addons/DistanceFieldFont/DistanceFieldFont.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   
   <PropertyGroup>
-    <AssemblyName>vke.DistanceFieldFont</AssemblyName>
+    <AssemblyName>DistanceFieldFont</AssemblyName>
     <PackageId>vke.DistanceFieldFont</PackageId>
     <AssemblyVersion>0.1.0</AssemblyVersion>
     <Description>vke.net signed distance field font addons, BMFont file format</Description>
diff --git a/addons/EnvironmentPipeline/EnvironmentPipeline.cs b/addons/EnvironmentPipeline/EnvironmentPipeline.cs
index 1ef9472..cab3f30 100644
--- a/addons/EnvironmentPipeline/EnvironmentPipeline.cs
+++ b/addons/EnvironmentPipeline/EnvironmentPipeline.cs
@@ -177,7 +177,7 @@ namespace vke.Environment {
 				new VkDescriptorSetLayoutBinding (0, VkShaderStageFlags.Fragment, VkDescriptorType.CombinedImageSampler));
 
 
-			GraphicPipelineConfig cfg = GraphicPipelineConfig.CreateDefault (VkPrimitiveTopology.TriangleList, VkSampleCountFlags.SampleCount1, false, (int)dim, (int)dim);
+			GraphicPipelineConfig cfg = GraphicPipelineConfig.CreateDefault (VkPrimitiveTopology.TriangleList, VkSampleCountFlags.SampleCount1, false);
 			cfg.Layout = new PipelineLayout (Dev, dsLayout);
 			cfg.Layout.AddPushConstants (
 				new VkPushConstantRange (VkShaderStageFlags.Vertex | VkShaderStageFlags.Fragment, (uint)Marshal.SizeOf<Matrix4x4> () + 8));
@@ -228,6 +228,9 @@ namespace vke.Environment {
 
 					float roughness = 0;
 
+					cmd.SetScissor (dim, dim);
+					cmd.SetViewport ((float)(dim), (float)dim);
+
 					for (int m = 0; m < numMips; m++) {
 						roughness = (float)m / ((float)numMips - 1f);
 
diff --git a/samples/deferred/deferred.csproj b/samples/deferred/deferred.csproj
index fc6b70c..2db814f 100644
--- a/samples/deferred/deferred.csproj
+++ b/samples/deferred/deferred.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
         
     <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">    
-        <DefineConstants>TRACE;DEBUG;NETSTANDARD;NETSTANDARD2_0;MEMORY_POOLS;WITH_SHADOWS;_WITH_VKVG</DefineConstants>    
+        <DefineConstants>TRACE;NETSTANDARD;NETSTANDARD2_0;MEMORY_POOLS;WITH_SHADOWS;_WITH_VKVG;DEBUG;NETFRAMEWORK;NET472</DefineConstants>    
     </PropertyGroup>
     <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugCrow|AnyCPU' ">    
         <DefineConstants>TRACE;DEBUG;NETSTANDARD;NETSTANDARD2_0;MEMORY_POOLS;WITH_SHADOWS;_WITH_VKVG</DefineConstants>    
diff --git a/samples/deferred/shaders/GBuffPbr.frag b/samples/deferred/shaders/GBuffPbr.frag
index ca398e6..c6e1160 100644
--- a/samples/deferred/shaders/GBuffPbr.frag
+++ b/samples/deferred/shaders/GBuffPbr.frag
@@ -3,7 +3,6 @@
 #extension GL_ARB_shading_language_420pack : enable
 
 #define MANUAL_SRGB 0
-#define DEBUG 0
 
 layout (constant_id = 0) const float NEAR_PLANE = 0.1f;
 layout (constant_id = 1) const float FAR_PLANE = 256.0f;
diff --git a/samples/deferred/shaders/GBuffPbrTexArray.frag b/samples/deferred/shaders/GBuffPbrTexArray.frag
index dee3471..3d666d0 100644
--- a/samples/deferred/shaders/GBuffPbrTexArray.frag
+++ b/samples/deferred/shaders/GBuffPbrTexArray.frag
@@ -3,7 +3,6 @@
 #extension GL_ARB_shading_language_420pack : enable
 
 #define MANUAL_SRGB 0
-#define DEBUG 0
 
 layout (constant_id = 0) const float NEAR_PLANE = 0.1f;
 layout (constant_id = 1) const float FAR_PLANE = 256.0f;