debug

diff --git a/addons/DistanceFieldFont/DistanceFieldFont.csproj b/addons/DistanceFieldFont/DistanceFieldFont.csproj
index 676196f07654b165f76f7a85de7427a9dc8554bc..93faa2745fb6cc028b269dc3d53ddf0870382360 100644 (file)
--- 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 1ef9472d56ea40cd1ad324198216828ffb1b787a..cab3f3092a3519b93a9dcd1cc1fa7c52793428bb 100644 (file)
--- 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 fc6b70ccd8a16df8adfa4e8d11f71b4b062dc256..2db814fab733ada7ce7e82c4c679a295a365dec1 100644 (file)
--- 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 ca398e68b152d91755192ffa1b87f231ea916213..c6e116068abb6a5b89b3d8436d2b7f6917f754b3 100644 (file)
--- 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 dee3471a693a799acf5ea04b772a649456a128ba..3d666d0386ceb52cb998b579209116554b7094eb 100644 (file)
--- 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;