Fixed KRDatablock::Append where the data was not expanded correctly to concatenate a std::String. Converted sprite shader. Adjusted Spirv compile logging.

kraken/KRDataBlock.cpp

@@ -329,7 +329,7 @@ void KRDataBlock::append(const std::string &s)
     append((void*)szText, text_length + 1);
   } else {
     // prev_size includes a null terminating character, don't need to add two.
-    expand(prev_size + text_length);
+    expand(text_length);
     lock();
     // Copy new string, overwriting prior null terminating character and
     // including new terminating character

kraken/KRShaderManager.cpp

@@ -288,8 +288,10 @@ bool KRShaderManager::compileAll(KRBundle* outputBundle, KRUnknown* logResource)
         program.addShader(&shader);
       } else {
         const char* log = shader.getInfoLog();
+        if (log[0] != '\0') {
           logResource->getData()->append(log);
           logResource->getData()->append("\n");
+        }
         success = false;
       }
     };
@@ -299,8 +301,10 @@ bool KRShaderManager::compileAll(KRBundle* outputBundle, KRUnknown* logResource)
     
     if (!program.link(messages)) {
       const char* log = program.getInfoLog();
+      if (log[0] != '\0') {
         logResource->getData()->append(log);
         logResource->getData()->append("\n");
+      }
       success = false;
     }
 
@@ -312,8 +316,11 @@ bool KRShaderManager::compileAll(KRBundle* outputBundle, KRUnknown* logResource)
           spv::SpvBuildLogger logger;
           glslang::SpvOptions spvOptions;
           glslang::GlslangToSpv(*program.getIntermediate((EShLanguage)stage), spirv, &logger, &spvOptions);
-          logResource->getData()->append(logger.getAllMessages().c_str());
+          std::string messages = logger.getAllMessages();
+          if (!messages.empty()) {
+            logResource->getData()->append(messages.c_str());
             logResource->getData()->append("\n");
+          }
 
           std::string shader_name;
           switch (stage)

standard_assets/shaders/CMakeLists.txt

@@ -1,3 +1,5 @@
 set(KRAKEN_STANDARD_ASSETS "${KRAKEN_STANDARD_ASSETS}" PARENT_SCOPE)
 add_standard_asset(simple_blit.frag)
 add_standard_asset(simple_blit.vert)
+add_standard_asset(sprite.frag)
+add_standard_asset(sprite.vert)

standard_assets/shaders/simple_blit.frag

@@ -1,4 +1,4 @@
-//  Copyright 2019 Kearwood Gilbert. All rights reserved.
+//  Copyright 2020 Kearwood Gilbert. All rights reserved.
 //
 //  Redistribution and use in source and binary forms, with or without modification, are
 //  permitted provided that the following conditions are met:

standard_assets/shaders/simple_blit.vert

@@ -1,4 +1,4 @@
-//  Copyright 2019 Kearwood Gilbert. All rights reserved.
+//  Copyright 2020 Kearwood Gilbert. All rights reserved.
 //
 //  Redistribution and use in source and binary forms, with or without modification, are
 //  permitted provided that the following conditions are met:

standard_assets/shaders/sprite.frag

@@ -1,8 +1,4 @@
-//
-//  sprite.fsh
-//  KREngine
-//
-//  Copyright 2012 Kearwood Gilbert. All rights reserved.
+//  Copyright 2020 Kearwood Gilbert. All rights reserved.
 //
 //  Redistribution and use in source and binary forms, with or without modification, are
 //  permitted provided that the following conditions are met:
@@ -29,12 +25,21 @@
 //  or implied, of Kearwood Gilbert.
 //
 
-out vec4 colorOut;
+#version 400
+#extension GL_ARB_separate_shader_objects : enable
+#extension GL_ARB_shading_language_420pack : enable
+
+layout (binding = 0) uniform MaterialObject
+{
+    float alpha;
+} material;
+layout (binding = 1) uniform sampler2D diffuseTexture;
+
+layout (location = 0) in vec2 textureCoordinate;
+layout (location = 0) out vec4 colorOut;
 
 in mediump vec2 texCoord;
-uniform sampler2D diffuseTexture;
-uniform lowp float material_alpha;
 
 void main() {
-    colorOut = vec4(vec3(texture(diffuseTexture, texCoord)), 1.0) * material_alpha;
+    colorOut = vec4(vec3(texture(diffuseTexture, texCoord)), 1.0) * material.alpha;
 }

standard_assets/shaders/sprite.vert

@@ -1,8 +1,4 @@
-//
-//  sprite.vsh
-//  KREngine
-//
-//  Copyright 2012 Kearwood Gilbert. All rights reserved.
+//  Copyright 2020 Kearwood Gilbert. All rights reserved.
 //
 //  Redistribution and use in source and binary forms, with or without modification, are
 //  permitted provided that the following conditions are met:
@@ -29,13 +25,18 @@
 //  or implied, of Kearwood Gilbert.
 //
 
-in mediump vec2	vertex_uv;
-uniform highp mat4      mvp_matrix; // mvp_matrix is the result of multiplying the model, view, and projection matrices
-uniform mediump vec4    viewport;
+#version 400
+#extension GL_ARB_separate_shader_objects : enable
+#extension GL_ARB_shading_language_420pack : enable
 
-out mediump vec2 texCoord;
+layout (std140, binding = 0) uniform buf {
+        mat4 mvp_matrix; // mvp_matrix is the result of multiplying the model, view, and projection matrices 
+        vec4 viewport;
+} ubuf;
+layout (location = 0) in vec2 vertex_uv;
+layout (location = 0) out vec2 textureCoordinate;
 
 void main() {
-    texCoord = vertex_uv;
-    gl_Position = mvp_matrix * vec4(vertex_uv.x * 2.0 - 1.0, vertex_uv.y * 2.0 - 1.0, 0.0, 1.0);
+    textureCoordinate = vertex_uv;
+    gl_Position = ubuf.mvp_matrix * vec4(vertex_uv.x * 2.0 - 1.0, vertex_uv.y * 2.0 - 1.0, 0.0, 1.0);
 }

tools/convert/main.cpp

@@ -169,7 +169,7 @@ int main( int argc, char *argv[] )
         printf("Failed to get shader compile log.  (Error %i)\n", result.result);
       } else {
         // result.data will be a null terminated string
-        if (result.data != nullptr && static_cast<char*>(result.data)[0] != '\0') {
+        if (result.data != nullptr && result.length > 0) {
           printf("Shader compile log:\n%s\n", static_cast<char *>(result.data));
         }
       }