Fixed: OpenGL 1 and 3 compatibility types and fixed bitmaptext.glsl layout

Author: MrcSnm

modules/renderer/backends/gl/hip/hiprenderer/backend/gl/glshader.d

@@ -187,6 +187,9 @@ class Hip_GL_ShaderImpl : IShader
     #elif defined(VERTEX)
         #define ATTRIBUTE(LOC) attribute
     #endif
+
+    #define UVEC2 vec2
+    #define UINT float
 #else
     #define IN in
     #define OUT out
@@ -201,6 +204,10 @@ class Hip_GL_ShaderImpl : IShader
         #define INOUT OUT
         #define ATTRIBUTE(LOC) layout (location = LOC) in
     #endif
+
+    #define UVEC2 uvec2
+    #define UINT uint
+
 #endif
 
 #ifdef FRAGMENT

modules/renderer/shaders/opengl/bitmaptext.glsl

@@ -1,8 +1,9 @@
 INOUT vec2 inTexST;
 #ifdef VERTEX
-ATTRIBUTE(0) uvec2 vPosition;
-ATTRIBUTE(1) uint vZ;
-ATTRIBUTE(2) vec2 vTexST;
+
+ATTRIBUTE(0) UVEC2 vPosition;
+ATTRIBUTE(1) vec2 vTexST;
+ATTRIBUTE(2) UINT vZ;
 
 UNIFORM_BUFFER_OBJECT(0, Cbuf, cbuf, 
 {

modules/renderer/source/hip/hiprenderer/vertex.d

@@ -217,7 +217,7 @@ private ref HipVertexAttributeInfo appendAttributeField(return ref HipVertexAttr
         isNormalized: isNormalized
     );
 
-    // if(!isPadding)
+    if(!isPadding)
     {
         info.fields~= field;
         info.dataCount+= count;

modules/util/source/hip/util/conv.d

@@ -163,18 +163,7 @@ TO to(TO, FROM)(FROM f) pure nothrow
         else
             return toString(f);
     }
-    else static if(is(TO == int) || is(TO == long) || is(TO == short) || is(TO == byte))
-    {
-        long ret;
-        static if(!is(FROM == string))
-            ret = toInt(f.toString);
-        else
-            ret = toInt(f);
-        assert(ret <= TO.max, "The value overflows the maximum of "~TO.stringof);
-        assert(ret >= TO.min, "The value underflows the minimum of "~TO.stringof);
-        return cast(TO)ret;
-    }
-    else static if(is(TO == uint) || is(TO == ulong) || is(TO == ubyte) || is(TO == ushort))
+    else static if(__traits(isIntegral, TO))
     {
         long ret;
         static if(__traits(isFloating, FROM))
@@ -186,7 +175,7 @@ TO to(TO, FROM)(FROM f) pure nothrow
         else
             ret = toInt(f);
         assert(ret <= TO.max, "The value overflows the maximum of "~TO.stringof);
-        assert(ret >= 0, "The value received is not unsigned. ");
+        assert(ret >= TO.min, "The value underflows the minimum of "~TO.stringof);
         return cast(TO)ret;
     }
     else static if(is(TO == float) || is(TO == double))

source/hip/graphics/g2d/textrenderer.d

@@ -27,7 +27,7 @@ public import hip.api.graphics.text : HipTextAlign, Size;
     short2 vPosition;
     @HipShaderInputNormalized ushort[2] vTexST;
     short vZ;
-    short padding; //Ignore that.
+    @HipShaderInputPadding short padding; //Ignore that.
 
     static enum size_t quadsCount = HipTextRendererVertex.sizeof*4;
 }