cleanup and framebuffer creation

open_engine/include/open_engine.hpp

@@ -1,22 +1,26 @@
 #ifndef OPEN_ENGINE_HPP
 #define OPEN_ENGINE_HPP
 
-#include "open_engine/core.hpp"
+#include "open_engine/orthographic_camera_controller.hpp"
-#include "open_engine/ref_scope.hpp"
-#include "open_engine/application.hpp"
-#include "open_engine/logging.hpp"
-#include "open_engine/events/key_event.hpp"
 #include "open_engine/imgui/imgui_layer.hpp"
-#include "open_engine/renderer/render_command.hpp"
+#include "open_engine/events/key_event.hpp"
-#include "open_engine/renderer/renderer.hpp"
+#include "open_engine/application.hpp"
+#include "open_engine/ref_scope.hpp"
+#include "open_engine/logging.hpp"
+
 #include "open_engine/core/time.hpp"
+#include "open_engine/core.hpp"
+
 #include "open_engine/input/input_system.hpp"
 #include "open_engine/input/mouse_codes.hpp"
 #include "open_engine/input/keycodes.hpp"
+
+#include "open_engine/renderer/render_command.hpp"
+#include "open_engine/renderer/framebuffer.hpp"
+#include "open_engine/renderer/renderer2d.hpp"
+#include "open_engine/renderer/renderer.hpp"
+#include "open_engine/renderer/texture.hpp"
 #include "open_engine/renderer/buffer.hpp"
 #include "open_engine/renderer/shader.hpp"
-#include "open_engine/renderer/texture.hpp"
-#include "open_engine/orthographic_camera_controller.hpp"
-#include "open_engine/renderer/renderer2d.hpp"
 
 #endif // OPEN_ENGINE_HPP

open_engine/include/open_engine/imgui/imgui_layer.hpp

@@ -1,6 +1,7 @@
 #ifndef IMGUI_LAYER_HPP
 #define IMGUI_LAYER_HPP
 
+#include "open_engine/events/event.hpp"
 #include "open_engine/layer.hpp"
 
 namespace OpenEngine {
@@ -13,6 +14,7 @@ namespace OpenEngine {
             virtual void OnAttach() override;
             virtual void OnDetach() override;
             virtual void OnImGuiRender() override;
+            virtual void OnEvent(Event& event) override;
 
             void Begin();
             void End();

open_engine/include/open_engine/opengl/opengl_framebuffer.hpp

@@ -0,0 +1,34 @@
+#ifndef OPENGL_FRAMEBUFFER_HPP
+#define OPENGL_FRAMEBUFFER_HPP
+
+#include <renderer/framebuffer.hpp>
+
+#include <cstdint>
+
+namespace OpenEngine {
+    class OpenGLFramebuffer : public FrameBuffer
+	{
+	public:
+		OpenGLFramebuffer(const FramebufferSpecification& spec);
+		virtual ~OpenGLFramebuffer();
+
+		void Invalidate();
+
+		virtual void Bind() override;
+		virtual void Unbind() override;
+
+        virtual void Resize(uint32_t width, uint32_t height) override;
+
+		virtual uint32_t GetColorAttachmentRendererID() const override { return color_attachment; }
+
+		virtual const FramebufferSpecification& GetSpecification() const override { return specs; }
+
+	private:
+		uint32_t id = 0;
+		uint32_t color_attachment = 0, depth_attachment = 0;
+		FramebufferSpecification specs;
+	};
+
+}
+
+#endif // OPENGL_FRAMEBUFFER_HPP

open_engine/include/open_engine/orthographic_camera_controller.hpp

@@ -16,6 +16,7 @@ namespace OpenEngine {
 
             void OnUpdate();
             void OnEvent(Event& e);
+            void OnResize(float width, float height);
 
             const OrthographicCamera& GetCamera() const { return camera; };
             OrthographicCamera& GetCamera() { return camera; };

open_engine/include/open_engine/renderer/framebuffer.hpp

@@ -0,0 +1,31 @@
+#ifndef FRAMEBUFFER_HPP
+#define FRAMEBUFFER_HPP
+
+#include <cstdint>
+
+namespace OpenEngine {
+    struct FramebufferSpecification
+    {
+        uint32_t width, height;
+        uint32_t samples = 1;
+
+        bool swap_chain_target = false;
+    };
+
+    class FrameBuffer
+    {
+        public:
+            virtual void Bind() = 0;
+            virtual void Unbind() = 0;
+
+            virtual void Resize(uint32_t width, uint32_t height) = 0;
+
+            virtual uint32_t GetColorAttachmentRendererID() const = 0;
+
+            virtual const FramebufferSpecification& GetSpecification() const = 0;
+
+            static Ref<FrameBuffer> Create(const FramebufferSpecification& spec);
+    };
+}
+
+#endif // FRAMEBUFFER_HPP

open_engine/include/open_engine/renderer/renderer2d.hpp

@@ -1,7 +1,6 @@
 #ifndef RENDERER2D_HPP
 #define RENDERER2D_HPP
 
-#include "open_engine/logging.hpp"
 #include "open_engine/orthographic_camera.hpp"
 #include "open_engine/renderer/texture.hpp"
 #include "open_engine/ref_scope.hpp"
@@ -16,6 +15,15 @@ namespace OpenEngine {
         float rotation = 0.0f;
     };
 
+    struct Statistics
+    {
+        uint32_t draw_calls = 0;
+        uint32_t quad_count = 0;
+
+        uint32_t GetToralVertexCount() { return quad_count * 4; };
+        uint32_t GetToralIndexCount() { return quad_count * 6; };
+    };
+
     class Renderer2D
     {
         public:
@@ -28,6 +36,12 @@ namespace OpenEngine {
 
             static void DrawQuad(const Transform& transform_data, const glm::vec4& color);
             static void DrawQuad(const Transform& transform_data, const Ref<Texture2D>& texture, float tiling_factor = 1.0f);
+
+            static void ResetStats();
+            static const Statistics& GetStats();
+
+        private:
+            static void FlushAndReset();
     };
 }
 

open_engine/src/open_engine/application.cpp

@@ -81,9 +81,9 @@ namespace OpenEngine {
         {
             OE_PROFILE_SCOPE("Layers OnEvent");
             for (auto it = layer_stack.end(); it != layer_stack.begin();) {
-                (*--it)->OnEvent(event);
                 if (event.handled)
                     break;
+                (*--it)->OnEvent(event);
             }
         }
     }

open_engine/src/open_engine/imgui/imgui_layer.cpp

@@ -1,3 +1,4 @@
+#include "imgui.h"
 #include "instrumentor.hpp"
 #include <pch.hpp>
 
@@ -336,4 +337,11 @@ namespace OpenEngine {
         if (show)
             ImGui::ShowDemoWindow(&show);
     }
+
+    void ImGuiLayer::OnEvent(Event& event)
+    {
+        ImGuiIO& io = ImGui::GetIO();
+		event.handled |= event.IsInCategory(EventCategoryMouse) & io.WantCaptureMouse;
+		event.handled |= event.IsInCategory(EventCategoryKeyboard) & io.WantCaptureKeyboard;
+    }
 }

open_engine/src/open_engine/opengl/opengl_framebuffer.cpp

@@ -0,0 +1,69 @@
+#include <pch.hpp>
+
+#include <core.hpp>
+#include <opengl/opengl_framebuffer.hpp>
+
+#include <glad/glad.h>
+
+namespace OpenEngine {
+	OpenGLFramebuffer::OpenGLFramebuffer(const FramebufferSpecification& spec)
+		: specs(spec)
+	{
+		Invalidate();
+	}
+
+	OpenGLFramebuffer::~OpenGLFramebuffer()
+	{
+		glDeleteFramebuffers(1, &id);
+        glDeleteTextures(1, &color_attachment);
+        glDeleteTextures(1, &depth_attachment);
+	}
+
+	void OpenGLFramebuffer::Invalidate()
+	{
+        if (id) {
+            glDeleteFramebuffers(1, &id);
+            glDeleteTextures(1, &color_attachment);
+            glDeleteTextures(1, &depth_attachment);
+        }
+
+		glCreateFramebuffers(1, &id);
+		glBindFramebuffer(GL_FRAMEBUFFER, id);
+		
+		glCreateTextures(GL_TEXTURE_2D, 1, &color_attachment);
+		glBindTexture(GL_TEXTURE_2D, color_attachment);
+		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, specs.width, specs.height, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+
+		glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, color_attachment, 0);
+
+		glCreateTextures(GL_TEXTURE_2D, 1, &depth_attachment);
+		glBindTexture(GL_TEXTURE_2D, depth_attachment);
+		glTexStorage2D(GL_TEXTURE_2D, 1, GL_DEPTH24_STENCIL8, specs.width, specs.height);
+		glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_TEXTURE_2D, depth_attachment, 0);
+
+		OE_CORE_ASSERT(glCheckFramebufferStatus(GL_FRAMEBUFFER) == GL_FRAMEBUFFER_COMPLETE, "Framebuffer is incomplete!");
+
+		glBindFramebuffer(GL_FRAMEBUFFER, 0);
+	}
+
+	void OpenGLFramebuffer::Bind()
+	{
+		glBindFramebuffer(GL_FRAMEBUFFER, id);
+        glViewport(0, 0, specs.width, specs.height);
+	}
+
+	void OpenGLFramebuffer::Unbind()
+	{
+		glBindFramebuffer(GL_FRAMEBUFFER, 0);
+	}
+
+    void OpenGLFramebuffer::Resize(uint32_t width, uint32_t height)
+    {
+        specs.width = width;
+        specs.height = height;
+
+        Invalidate();
+    }
+}

open_engine/src/open_engine/opengl/opengl_renderer_api.cpp

@@ -66,7 +66,7 @@ namespace OpenEngine {
     {
         OE_PROFILE_FUNCTION();
 
-        uint32_t count = index_count? vertex_array->GetIndexBuffer()->GetCount() : index_count;
+        uint32_t count = index_count? index_count : vertex_array->GetIndexBuffer()->GetCount();
         glDrawElements(GL_TRIANGLES, count, GL_UNSIGNED_INT, nullptr);
         glBindTexture(GL_TEXTURE_2D, 0);
     }

open_engine/src/open_engine/opengl/opengl_texture.cpp

@@ -70,7 +70,6 @@ namespace OpenEngine {
     {
         OE_PROFILE_FUNCTION();
 
-        OE_CORE_DEBUG("id {}", id);
         glDeleteTextures(1, &id);
     }
 

open_engine/src/open_engine/orthographic_camera_controller.cpp

@@ -68,6 +68,12 @@ namespace OpenEngine {
         dispatcher.Dispatch<WindowResizeEvent>(BIND_EVENT_FN(OrthographicCameraController::OnWindowResized));
     }
 
+    void OrthographicCameraController::OnResize(float width, float height)
+    {
+        aspect_ratio = width / height;
+        camera.SetProjection(-aspect_ratio * zoom, aspect_ratio * zoom, -zoom, zoom);
+    }
+
     bool OrthographicCameraController::OnMouseScrolled(MouseScrolledEvent& e)
     {
         OE_PROFILE_FUNCTION();
@@ -82,8 +88,7 @@ namespace OpenEngine {
     {
         OE_PROFILE_FUNCTION();
 
-        aspect_ratio = (float)e.GetWidth() / (float)e.GetHeight();
+        OnResize(e.GetWidth(), e.GetHeight());
-        camera.SetProjection(-aspect_ratio * zoom, aspect_ratio * zoom, -zoom, zoom);
 
         return false;
     }

open_engine/src/open_engine/renderer/buffer.cpp

@@ -38,8 +38,8 @@ namespace OpenEngine {
             case ShaderDataType::Float2: return 2;
             case ShaderDataType::Float3: return 3;
             case ShaderDataType::Float4: return 4;
-            case ShaderDataType::Mat3: return 3 * 3;
+            case ShaderDataType::Mat3: return 3; // * 3 float3;
-            case ShaderDataType::Mat4: return 4 * 4;
+            case ShaderDataType::Mat4: return 4; // * 4 float4;
             case ShaderDataType::Int: return 1;
             case ShaderDataType::Int2: return 2;
             case ShaderDataType::Int3: return 3;

open_engine/src/open_engine/renderer/framebuffer.cpp

@@ -0,0 +1,20 @@
+#include <pch.hpp>
+
+#include <renderer/framebuffer.hpp>
+#include <renderer/renderer.hpp>
+#include <open_engine/opengl/opengl_framebuffer.hpp>
+
+namespace OpenEngine {
+    Ref<FrameBuffer> FrameBuffer::Create(const FramebufferSpecification& spec)
+    {
+        OE_PROFILE_FUNCTION();
+
+        switch (Renderer::GetAPI()) {
+            case RendererAPI::API::None : OE_CORE_ASSERT(false, "No render API selected!"); return nullptr;
+            case RendererAPI::API::OpenGL : return CreateRef<OpenGLFramebuffer>(spec);
+        }
+
+        OE_CORE_ASSERT(false, "Selected API not supported");
+        return nullptr;
+    }
+}

open_engine/src/open_engine/renderer/renderer2d.cpp

@@ -6,7 +6,6 @@
 #include <renderer/texture.hpp>
 #include <renderer/buffer.hpp>
 #include <renderer/shader.hpp>
-#include "logging.hpp"
 
 #include <cstdint>
 #include <glm/fwd.hpp>
@@ -25,9 +24,9 @@ namespace OpenEngine {
 
     struct Renderer2DData
     {
-        const uint32_t max_quads = 10000;
+        static const uint32_t max_quads = 10000;
-        const uint32_t max_vertices = max_quads * 4;
+        static const uint32_t max_vertices = max_quads * 4;
-        const uint32_t max_indices = max_quads * 6;
+        static const uint32_t max_indices = max_quads * 6;
         static const uint32_t max_texture_slots = 32;
 
         Ref<VertexArray> vertex_array;
@@ -43,6 +42,8 @@ namespace OpenEngine {
         uint32_t texture_slot_index = 1; // 0 is white texture
 
         glm::vec4 quad_vertex_positioning[4];
+
+        Statistics stats;
     };
 
     static Renderer2DData renderer_data;
@@ -113,10 +114,10 @@ namespace OpenEngine {
         renderer_data.vertex_buffer.reset();
         renderer_data.texture_shader.reset();
 
-        for (uint32_t i = 0; i < renderer_data.texture_slot_index; i++) {
+        delete[] renderer_data.quad_vertex_base;
-            OE_CORE_DEBUG("force cleaning {}", renderer_data.texture_slots[i]->GetID());
+
+        for (uint32_t i = 0; i < renderer_data.texture_slot_index; i++)
             renderer_data.texture_slots[i].reset();
-        }
 
         OE_PROFILE_FUNCTION();
     }
@@ -155,12 +156,17 @@ namespace OpenEngine {
             renderer_data.texture_slots[i]->Bind(i);
 
         RenderCommand::DrawIndexed(renderer_data.vertex_array, renderer_data.quad_index_count);
+        
+        renderer_data.stats.draw_calls++;
     }
 
     void Renderer2D::DrawQuad(const Transform& transform_data, const Ref<Texture2D>& texture, float tiling_factor)
     {
         OE_PROFILE_FUNCTION();
 
+        if (renderer_data.quad_index_count >= Renderer2DData::max_indices)
+            FlushAndReset();
+
         constexpr glm::vec4 color = glm::vec4(1.0f);
 
         glm::vec3 position = transform_data.position;
@@ -175,6 +181,9 @@ namespace OpenEngine {
         }
 
         if (texture_index == 0) {
+            if (renderer_data.texture_slot_index >= Renderer2DData::max_texture_slots)
+                FlushAndReset();
+
             texture_index = (float)renderer_data.texture_slot_index;
             renderer_data.texture_slots[renderer_data.texture_slot_index] = texture;
             renderer_data.texture_slot_index++;
@@ -213,12 +222,16 @@ namespace OpenEngine {
         renderer_data.quad_vertex_ptr++;
 
         renderer_data.quad_index_count += 6;
+        renderer_data.stats.quad_count++;
     }
 
     void Renderer2D::DrawQuad(const Transform& transform_data, const glm::vec4& color)
     {
         OE_PROFILE_FUNCTION();
 
+        if (renderer_data.quad_index_count >= Renderer2DData::max_indices)
+            FlushAndReset();
+
         glm::vec3 position = transform_data.position;
         glm::vec3 size = transform_data.size;
 
@@ -255,5 +268,26 @@ namespace OpenEngine {
         renderer_data.quad_vertex_ptr++;
 
         renderer_data.quad_index_count += 6;
+        renderer_data.stats.quad_count++;
+    }
+
+    void Renderer2D::ResetStats()
+    {
+        memset(&renderer_data.stats, 0, sizeof(Statistics));
+    }
+
+    const Statistics& Renderer2D::GetStats()
+    {
+        return renderer_data.stats;
+    }
+
+    void Renderer2D::FlushAndReset()
+    {
+        EndScene();
+
+        renderer_data.quad_index_count = 0;
+        renderer_data.quad_vertex_ptr = renderer_data.quad_vertex_base;
+
+        renderer_data.texture_slot_index = 1; 
     }
 }

open_engine/src/open_engine/window/linux_window.cpp

@@ -168,7 +168,6 @@ namespace OpenEngine {
 
     void LinuxWindow::Shutdown()
     {
-        OE_CORE_DEBUG("context shutdown");
         glfwDestroyWindow(gl_window);
         glfwTerminate();
         gl_window = nullptr;

resources/glad/include/KHR/khrplatform.h

@@ -0,0 +1,311 @@
+#ifndef __khrplatform_h_
+#define __khrplatform_h_
+
+/*
+** Copyright (c) 2008-2018 The Khronos Group Inc.
+**
+** Permission is hereby granted, free of charge, to any person obtaining a
+** copy of this software and/or associated documentation files (the
+** "Materials"), to deal in the Materials without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Materials, and to
+** permit persons to whom the Materials are furnished to do so, subject to
+** the following conditions:
+**
+** The above copyright notice and this permission notice shall be included
+** in all copies or substantial portions of the Materials.
+**
+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+*/
+
+/* Khronos platform-specific types and definitions.
+ *
+ * The master copy of khrplatform.h is maintained in the Khronos EGL
+ * Registry repository at https://github.com/KhronosGroup/EGL-Registry
+ * The last semantic modification to khrplatform.h was at commit ID:
+ *      67a3e0864c2d75ea5287b9f3d2eb74a745936692
+ *
+ * Adopters may modify this file to suit their platform. Adopters are
+ * encouraged to submit platform specific modifications to the Khronos
+ * group so that they can be included in future versions of this file.
+ * Please submit changes by filing pull requests or issues on
+ * the EGL Registry repository linked above.
+ *
+ *
+ * See the Implementer's Guidelines for information about where this file
+ * should be located on your system and for more details of its use:
+ *    http://www.khronos.org/registry/implementers_guide.pdf
+ *
+ * This file should be included as
+ *        #include <KHR/khrplatform.h>
+ * by Khronos client API header files that use its types and defines.
+ *
+ * The types in khrplatform.h should only be used to define API-specific types.
+ *
+ * Types defined in khrplatform.h:
+ *    khronos_int8_t              signed   8  bit
+ *    khronos_uint8_t             unsigned 8  bit
+ *    khronos_int16_t             signed   16 bit
+ *    khronos_uint16_t            unsigned 16 bit
+ *    khronos_int32_t             signed   32 bit
+ *    khronos_uint32_t            unsigned 32 bit
+ *    khronos_int64_t             signed   64 bit
+ *    khronos_uint64_t            unsigned 64 bit
+ *    khronos_intptr_t            signed   same number of bits as a pointer
+ *    khronos_uintptr_t           unsigned same number of bits as a pointer
+ *    khronos_ssize_t             signed   size
+ *    khronos_usize_t             unsigned size
+ *    khronos_float_t             signed   32 bit floating point
+ *    khronos_time_ns_t           unsigned 64 bit time in nanoseconds
+ *    khronos_utime_nanoseconds_t unsigned time interval or absolute time in
+ *                                         nanoseconds
+ *    khronos_stime_nanoseconds_t signed time interval in nanoseconds
+ *    khronos_boolean_enum_t      enumerated boolean type. This should
+ *      only be used as a base type when a client API's boolean type is
+ *      an enum. Client APIs which use an integer or other type for
+ *      booleans cannot use this as the base type for their boolean.
+ *
+ * Tokens defined in khrplatform.h:
+ *
+ *    KHRONOS_FALSE, KHRONOS_TRUE Enumerated boolean false/true values.
+ *
+ *    KHRONOS_SUPPORT_INT64 is 1 if 64 bit integers are supported; otherwise 0.
+ *    KHRONOS_SUPPORT_FLOAT is 1 if floats are supported; otherwise 0.
+ *
+ * Calling convention macros defined in this file:
+ *    KHRONOS_APICALL
+ *    KHRONOS_APIENTRY
+ *    KHRONOS_APIATTRIBUTES
+ *
+ * These may be used in function prototypes as:
+ *
+ *      KHRONOS_APICALL void KHRONOS_APIENTRY funcname(
+ *                                  int arg1,
+ *                                  int arg2) KHRONOS_APIATTRIBUTES;
+ */
+
+#if defined(__SCITECH_SNAP__) && !defined(KHRONOS_STATIC)
+#   define KHRONOS_STATIC 1
+#endif
+
+/*-------------------------------------------------------------------------
+ * Definition of KHRONOS_APICALL
+ *-------------------------------------------------------------------------
+ * This precedes the return type of the function in the function prototype.
+ */
+#if defined(KHRONOS_STATIC)
+    /* If the preprocessor constant KHRONOS_STATIC is defined, make the
+     * header compatible with static linking. */
+#   define KHRONOS_APICALL
+#elif defined(_WIN32)
+#   define KHRONOS_APICALL __declspec(dllimport)
+#elif defined (__SYMBIAN32__)
+#   define KHRONOS_APICALL IMPORT_C
+#elif defined(__ANDROID__)
+#   define KHRONOS_APICALL __attribute__((visibility("default")))
+#else
+#   define KHRONOS_APICALL
+#endif
+
+/*-------------------------------------------------------------------------
+ * Definition of KHRONOS_APIENTRY
+ *-------------------------------------------------------------------------
+ * This follows the return type of the function  and precedes the function
+ * name in the function prototype.
+ */
+#if defined(_WIN32) && !defined(_WIN32_WCE) && !defined(__SCITECH_SNAP__)
+    /* Win32 but not WinCE */
+#   define KHRONOS_APIENTRY __stdcall
+#else
+#   define KHRONOS_APIENTRY
+#endif
+
+/*-------------------------------------------------------------------------
+ * Definition of KHRONOS_APIATTRIBUTES
+ *-------------------------------------------------------------------------
+ * This follows the closing parenthesis of the function prototype arguments.
+ */
+#if defined (__ARMCC_2__)
+#define KHRONOS_APIATTRIBUTES __softfp
+#else
+#define KHRONOS_APIATTRIBUTES
+#endif
+
+/*-------------------------------------------------------------------------
+ * basic type definitions
+ *-----------------------------------------------------------------------*/
+#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__GNUC__) || defined(__SCO__) || defined(__USLC__)
+
+
+/*
+ * Using <stdint.h>
+ */
+#include <stdint.h>
+typedef int32_t                 khronos_int32_t;
+typedef uint32_t                khronos_uint32_t;
+typedef int64_t                 khronos_int64_t;
+typedef uint64_t                khronos_uint64_t;
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+/*
+ * To support platform where unsigned long cannot be used interchangeably with
+ * inptr_t (e.g. CHERI-extended ISAs), we can use the stdint.h intptr_t.
+ * Ideally, we could just use (u)intptr_t everywhere, but this could result in
+ * ABI breakage if khronos_uintptr_t is changed from unsigned long to
+ * unsigned long long or similar (this results in different C++ name mangling).
+ * To avoid changes for existing platforms, we restrict usage of intptr_t to
+ * platforms where the size of a pointer is larger than the size of long.
+ */
+#if defined(__SIZEOF_LONG__) && defined(__SIZEOF_POINTER__)
+#if __SIZEOF_POINTER__ > __SIZEOF_LONG__
+#define KHRONOS_USE_INTPTR_T
+#endif
+#endif
+
+#elif defined(__VMS ) || defined(__sgi)
+
+/*
+ * Using <inttypes.h>
+ */
+#include <inttypes.h>
+typedef int32_t                 khronos_int32_t;
+typedef uint32_t                khronos_uint32_t;
+typedef int64_t                 khronos_int64_t;
+typedef uint64_t                khronos_uint64_t;
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+
+#elif defined(_WIN32) && !defined(__SCITECH_SNAP__)
+
+/*
+ * Win32
+ */
+typedef __int32                 khronos_int32_t;
+typedef unsigned __int32        khronos_uint32_t;
+typedef __int64                 khronos_int64_t;
+typedef unsigned __int64        khronos_uint64_t;
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+
+#elif defined(__sun__) || defined(__digital__)
+
+/*
+ * Sun or Digital
+ */
+typedef int                     khronos_int32_t;
+typedef unsigned int            khronos_uint32_t;
+#if defined(__arch64__) || defined(_LP64)
+typedef long int                khronos_int64_t;
+typedef unsigned long int       khronos_uint64_t;
+#else
+typedef long long int           khronos_int64_t;
+typedef unsigned long long int  khronos_uint64_t;
+#endif /* __arch64__ */
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+
+#elif 0
+
+/*
+ * Hypothetical platform with no float or int64 support
+ */
+typedef int                     khronos_int32_t;
+typedef unsigned int            khronos_uint32_t;
+#define KHRONOS_SUPPORT_INT64   0
+#define KHRONOS_SUPPORT_FLOAT   0
+
+#else
+
+/*
+ * Generic fallback
+ */
+#include <stdint.h>
+typedef int32_t                 khronos_int32_t;
+typedef uint32_t                khronos_uint32_t;
+typedef int64_t                 khronos_int64_t;
+typedef uint64_t                khronos_uint64_t;
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+
+#endif
+
+
+/*
+ * Types that are (so far) the same on all platforms
+ */
+typedef signed   char          khronos_int8_t;
+typedef unsigned char          khronos_uint8_t;
+typedef signed   short int     khronos_int16_t;
+typedef unsigned short int     khronos_uint16_t;
+
+/*
+ * Types that differ between LLP64 and LP64 architectures - in LLP64,
+ * pointers are 64 bits, but 'long' is still 32 bits. Win64 appears
+ * to be the only LLP64 architecture in current use.
+ */
+#ifdef KHRONOS_USE_INTPTR_T
+typedef intptr_t               khronos_intptr_t;
+typedef uintptr_t              khronos_uintptr_t;
+#elif defined(_WIN64)
+typedef signed   long long int khronos_intptr_t;
+typedef unsigned long long int khronos_uintptr_t;
+#else
+typedef signed   long  int     khronos_intptr_t;
+typedef unsigned long  int     khronos_uintptr_t;
+#endif
+
+#if defined(_WIN64)
+typedef signed   long long int khronos_ssize_t;
+typedef unsigned long long int khronos_usize_t;
+#else
+typedef signed   long  int     khronos_ssize_t;
+typedef unsigned long  int     khronos_usize_t;
+#endif
+
+#if KHRONOS_SUPPORT_FLOAT
+/*
+ * Float type
+ */
+typedef          float         khronos_float_t;
+#endif
+
+#if KHRONOS_SUPPORT_INT64
+/* Time types
+ *
+ * These types can be used to represent a time interval in nanoseconds or
+ * an absolute Unadjusted System Time.  Unadjusted System Time is the number
+ * of nanoseconds since some arbitrary system event (e.g. since the last
+ * time the system booted).  The Unadjusted System Time is an unsigned
+ * 64 bit value that wraps back to 0 every 584 years.  Time intervals
+ * may be either signed or unsigned.
+ */
+typedef khronos_uint64_t       khronos_utime_nanoseconds_t;
+typedef khronos_int64_t        khronos_stime_nanoseconds_t;
+#endif
+
+/*
+ * Dummy value used to pad enum types to 32 bits.
+ */
+#ifndef KHRONOS_MAX_ENUM
+#define KHRONOS_MAX_ENUM 0x7FFFFFFF
+#endif
+
+/*
+ * Enumerated boolean type
+ *
+ * Values other than zero should be considered to be true.  Therefore
+ * comparisons should not be made against KHRONOS_TRUE.
+ */
+typedef enum {
+    KHRONOS_FALSE = 0,
+    KHRONOS_TRUE  = 1,
+    KHRONOS_BOOLEAN_ENUM_FORCE_SIZE = KHRONOS_MAX_ENUM
+} khronos_boolean_enum_t;
+
+#endif /* __khrplatform_h_ */