Merge branch 'main' into updatetemplate

Removed logic ops and enum values from the template
Update template for latest ABI breaks
2022-03-07 08:01:10 +00:00 · 2022-03-05 09:46:08 -05:00 · 2022-03-05 09:37:26 -05:00
12 changed files with 2133 additions and 4748 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -8,8 +8,8 @@ option(BUILD_SHARED_LIBS "Build shared library" ON)

 # Version
 SET(LIB_MAJOR_VERSION "1")
-SET(LIB_MINOR_VERSION "15")
-SET(LIB_REVISION "4")
+SET(LIB_MINOR_VERSION "2")
+SET(LIB_REVISION "1")
 SET(LIB_VERSION "${LIB_MAJOR_VERSION}.${LIB_MINOR_VERSION}.${LIB_REVISION}")

 # Build Type
@ -60,11 +60,6 @@ if(NOT MSVC)
 	set_property(TARGET Refresh PROPERTY COMPILE_FLAGS "-std=gnu99 -Wall -Wno-strict-aliasing -pedantic")
 endif()

-# Windows is silly and we need to manually include the Vulkan SDK
-if(MSVC)
-	target_include_directories(Refresh PUBLIC $ENV{VULKAN_SDK}/include)
-endif()
-
 # Refresh folders as includes, for other targets to consume
 target_include_directories(Refresh PUBLIC
 	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
--- a/include/Refresh.h
+++ b/include/Refresh.h
@ -55,8 +55,8 @@ extern "C" {
 /* Version API */

 #define REFRESH_MAJOR_VERSION   1
-#define REFRESH_MINOR_VERSION	15
-#define REFRESH_PATCH_VERSION	4
+#define REFRESH_MINOR_VERSION	2
+#define REFRESH_PATCH_VERSION	1

 #define REFRESH_COMPILED_VERSION ( \
 	(REFRESH_MAJOR_VERSION * 100 * 100) + \
@ -76,7 +76,6 @@ typedef struct Refresh_ShaderModule Refresh_ShaderModule;
 typedef struct Refresh_ComputePipeline Refresh_ComputePipeline;
 typedef struct Refresh_GraphicsPipeline Refresh_GraphicsPipeline;
 typedef struct Refresh_CommandBuffer Refresh_CommandBuffer;
-typedef struct Refresh_Fence Refresh_Fence;

 typedef enum Refresh_PresentMode
 {
@ -108,6 +107,15 @@ typedef enum Refresh_StoreOp
 	REFRESH_STOREOP_DONT_CARE
 } Refresh_StoreOp;

+typedef enum Refresh_ClearOptionsBits
+{
+	REFRESH_CLEAROPTIONS_COLOR   = 0x00000001,
+	REFRESH_CLEAROPTIONS_DEPTH   = 0x00000002,
+	REFRESH_CLEAROPTIONS_STENCIL = 0x00000004,
+} Refresh_ClearOptionsBits;
+
+typedef uint32_t Refresh_ClearOptions;
+
 typedef enum Refresh_IndexElementSize
 {
 	REFRESH_INDEXELEMENTSIZE_16BIT,
@ -116,38 +124,27 @@ typedef enum Refresh_IndexElementSize

 typedef enum Refresh_TextureFormat
 {
-	/* Unsigned Normalized Float Color Formats */
+	/* Color Formats */
 	REFRESH_TEXTUREFORMAT_R8G8B8A8,
 	REFRESH_TEXTUREFORMAT_B8G8R8A8,
 	REFRESH_TEXTUREFORMAT_R5G6B5,
 	REFRESH_TEXTUREFORMAT_A1R5G5B5,
 	REFRESH_TEXTUREFORMAT_B4G4R4A4,
+	REFRESH_TEXTUREFORMAT_BC1,
+	REFRESH_TEXTUREFORMAT_BC2,
+	REFRESH_TEXTUREFORMAT_BC3,
+	REFRESH_TEXTUREFORMAT_R8G8_SNORM,
+	REFRESH_TEXTUREFORMAT_R8G8B8A8_SNORM,
 	REFRESH_TEXTUREFORMAT_A2R10G10B10,
 	REFRESH_TEXTUREFORMAT_R16G16,
 	REFRESH_TEXTUREFORMAT_R16G16B16A16,
 	REFRESH_TEXTUREFORMAT_R8,
-	/* Compressed Unsigned Normalized Float Color Formats */
-	REFRESH_TEXTUREFORMAT_BC1,
-	REFRESH_TEXTUREFORMAT_BC2,
-	REFRESH_TEXTUREFORMAT_BC3,
-	REFRESH_TEXTUREFORMAT_BC7,
-	/* Signed Normalized Float Color Formats  */
-	REFRESH_TEXTUREFORMAT_R8G8_SNORM,
-	REFRESH_TEXTUREFORMAT_R8G8B8A8_SNORM,
-	/* Signed Float Color Formats */
-	REFRESH_TEXTUREFORMAT_R16_SFLOAT,
-	REFRESH_TEXTUREFORMAT_R16G16_SFLOAT,
-	REFRESH_TEXTUREFORMAT_R16G16B16A16_SFLOAT,
 	REFRESH_TEXTUREFORMAT_R32_SFLOAT,
 	REFRESH_TEXTUREFORMAT_R32G32_SFLOAT,
 	REFRESH_TEXTUREFORMAT_R32G32B32A32_SFLOAT,
-	/* Unsigned Integer Color Formats */
-	REFRESH_TEXTUREFORMAT_R8_UINT,
-	REFRESH_TEXTUREFORMAT_R8G8_UINT,
-	REFRESH_TEXTUREFORMAT_R8G8B8A8_UINT,
-	REFRESH_TEXTUREFORMAT_R16_UINT,
-	REFRESH_TEXTUREFORMAT_R16G16_UINT,
-	REFRESH_TEXTUREFORMAT_R16G16B16A16_UINT,
+	REFRESH_TEXTUREFORMAT_R16_SFLOAT,
+	REFRESH_TEXTUREFORMAT_R16G16_SFLOAT,
+	REFRESH_TEXTUREFORMAT_R16G16B16A16_SFLOAT,
 	/* Depth Formats */
 	REFRESH_TEXTUREFORMAT_D16_UNORM,
 	REFRESH_TEXTUREFORMAT_D32_SFLOAT,
@ -159,8 +156,7 @@ typedef enum Refresh_TextureUsageFlagBits
 {
 	REFRESH_TEXTUREUSAGE_SAMPLER_BIT              = 0x00000001,
 	REFRESH_TEXTUREUSAGE_COLOR_TARGET_BIT         = 0x00000002,
-	REFRESH_TEXTUREUSAGE_DEPTH_STENCIL_TARGET_BIT = 0x00000004,
-	REFRESH_TEXTUREUSAGE_COMPUTE_BIT              = 0X00000008
+	REFRESH_TEXTUREUSAGE_DEPTH_STENCIL_TARGET_BIT = 0x00000004
 } Refresh_TextureUsageFlagBits;

 typedef uint32_t Refresh_TextureUsageFlags;
@ -170,7 +166,10 @@ typedef enum Refresh_SampleCount
 	REFRESH_SAMPLECOUNT_1,
 	REFRESH_SAMPLECOUNT_2,
 	REFRESH_SAMPLECOUNT_4,
-	REFRESH_SAMPLECOUNT_8
+	REFRESH_SAMPLECOUNT_8,
+	REFRESH_SAMPLECOUNT_16,
+	REFRESH_SAMPLECOUNT_32,
+	REFRESH_SAMPLECOUNT_64
 } Refresh_SampleCount;

 typedef enum Refresh_CubeMapFace
@ -187,16 +186,14 @@ typedef enum Refresh_BufferUsageFlagBits
 {
 	REFRESH_BUFFERUSAGE_VERTEX_BIT 	=	0x00000001,
 	REFRESH_BUFFERUSAGE_INDEX_BIT  	=	0x00000002,
-	REFRESH_BUFFERUSAGE_COMPUTE_BIT  = 0x00000004,
-	REFRESH_BUFFERUSAGE_INDIRECT_BIT = 0x00000008
+	REFRESH_BUFFERUSAGE_COMPUTE_BIT =	0x00000004
 } Refresh_BufferUsageFlagBits;

 typedef uint32_t Refresh_BufferUsageFlags;

 typedef enum Refresh_VertexElementFormat
 {
-	REFRESH_VERTEXELEMENTFORMAT_UINT,
-	REFRESH_VERTEXELEMENTFORMAT_FLOAT,
+	REFRESH_VERTEXELEMENTFORMAT_SINGLE,
 	REFRESH_VERTEXELEMENTFORMAT_VECTOR2,
 	REFRESH_VERTEXELEMENTFORMAT_VECTOR3,
 	REFRESH_VERTEXELEMENTFORMAT_VECTOR4,
@ -282,7 +279,11 @@ typedef enum Refresh_BlendFactor
 	REFRESH_BLENDFACTOR_ONE_MINUS_DST_ALPHA,
 	REFRESH_BLENDFACTOR_CONSTANT_COLOR,
 	REFRESH_BLENDFACTOR_ONE_MINUS_CONSTANT_COLOR,
-	REFRESH_BLENDFACTOR_SRC_ALPHA_SATURATE
+	REFRESH_BLENDFACTOR_SRC_ALPHA_SATURATE,
+	REFRESH_BLENDFACTOR_SRC1_COLOR,
+	REFRESH_BLENDFACTOR_ONE_MINUS_SRC1_COLOR,
+	REFRESH_BLENDFACTOR_SRC1_ALPHA,
+	REFRESH_BLENDFACTOR_ONE_MINUS_SRC1_ALPHA
 } Refresh_BlendFactor;

 typedef enum Refresh_ColorComponentFlagBits
@ -326,14 +327,6 @@ typedef enum Refresh_BorderColor
 	REFRESH_BORDERCOLOR_INT_OPAQUE_WHITE
 } Refresh_BorderColor;

-typedef enum Refresh_Backend
-{
-	REFRESH_BACKEND_DONTCARE,
-	REFRESH_BACKEND_VULKAN,
-	REFRESH_BACKEND_PS5,
-	REFRESH_BACKEND_INVALID
-} Refresh_Backend;
-
 /* Structures */

 typedef struct Refresh_DepthStencilValue
@ -377,13 +370,11 @@ typedef struct Refresh_TextureSlice
 	uint32_t level;
 } Refresh_TextureSlice;

-typedef struct Refresh_IndirectDrawCommand
+typedef struct Refresh_PresentationParameters
 {
-	uint32_t vertexCount;
-	uint32_t instanceCount;
-	uint32_t firstVertex;
-	uint32_t firstInstance;
-} Refresh_IndirectDrawCommand;
+	void* deviceWindowHandle;
+	Refresh_PresentMode presentMode;
+} Refresh_PresentationParameters;

 /* State structures */

@ -451,6 +442,12 @@ typedef struct Refresh_ColorAttachmentBlendState
 	Refresh_ColorComponentFlags colorWriteMask;
 } Refresh_ColorAttachmentBlendState;

+typedef struct Refresh_ComputePipelineLayoutCreateInfo
+{
+	uint32_t bufferBindingCount;
+	uint32_t imageBindingCount;
+} Refresh_ComputePipelineLayoutCreateInfo;
+
 typedef struct Refresh_ShaderModuleCreateInfo
 {
 	size_t codeSize;
@ -463,8 +460,8 @@ typedef struct Refresh_TextureCreateInfo
 	uint32_t height;
 	uint32_t depth;
 	uint8_t isCube;
-	uint32_t levelCount;
 	Refresh_SampleCount sampleCount;
+	uint32_t levelCount;
 	Refresh_TextureFormat format;
 	Refresh_TextureUsageFlags usageFlags;
 } Refresh_TextureCreateInfo;
@ -490,6 +487,7 @@ typedef struct Refresh_ComputeShaderInfo

 typedef struct Refresh_RasterizerState
 {
+	uint8_t depthClampEnable;
 	Refresh_FillMode fillMode;
 	Refresh_CullMode cullMode;
 	Refresh_FrontFace frontFace;
@ -497,6 +495,7 @@ typedef struct Refresh_RasterizerState
 	float depthBiasConstantFactor;
 	float depthBiasClamp;
 	float depthBiasSlopeFactor;
+	float lineWidth;
 } Refresh_RasterizerState;

 typedef struct Refresh_MultisampleState
@ -521,6 +520,7 @@ typedef struct Refresh_DepthStencilState
 typedef struct Refresh_ColorAttachmentDescription
 {
 	Refresh_TextureFormat format;
+	Refresh_SampleCount sampleCount;
 	Refresh_ColorAttachmentBlendState blendState;
 } Refresh_ColorAttachmentDescription;

@ -553,6 +553,7 @@ typedef struct Refresh_ColorAttachmentInfo
 	uint32_t depth;
 	uint32_t layer;
 	uint32_t level;
+	Refresh_SampleCount sampleCount;
 	Refresh_Vec4 clearColor; /* Can be ignored by RenderPass */
 	Refresh_LoadOp loadOp;
 	Refresh_StoreOp storeOp;
@ -589,29 +590,15 @@ REFRESHAPI void Refresh_HookLogFunctions(
 	Refresh_LogFunc error
 );

-/* Backend selection */
-
-/* Select the graphics API backend that Refresh should use.
- *
- * Note that Refresh is not required to select your preferred backend
- * if it detects an incompatibility.
- *
- * Returns the backend that will actually be used, and fills in a window flag bitmask.
- * This bitmask should be used to create all windows that the device claims.
- *
- * preferredBackend: The preferred backend that Refresh should select.
- * flags: A pointer to a bitflag value that will be filled in with required SDL_WindowFlags masks.
- */
-REFRESHAPI Refresh_Backend Refresh_SelectBackend(Refresh_Backend preferredBackend, uint32_t *flags);
-
 /* Device */

 /* Create a rendering context for use on the calling thread.
- * You MUST have called Refresh_SelectDriver prior to calling this function.
 *
+ * presentationParameters: A window handle and presentation mode.
 * debugMode: Enable debug mode properties.
 */
 REFRESHAPI Refresh_Device* Refresh_CreateDevice(
+	Refresh_PresentationParameters *presentationParameters,
 	uint8_t debugMode
 );

@ -620,6 +607,30 @@ REFRESHAPI void Refresh_DestroyDevice(Refresh_Device *device);

 /* Drawing */

+/* Clears the targets of the currently bound framebuffer.
+ * If fewer colors are passed than the number of color targets in the
+ * framebuffer, this function will clear the first n color targets.
+ *
+ * NOTE:
+ * 		It is generally recommended to clear in BeginRenderPass
+ * 		rather than by calling this function unless necessary.
+ *
+ * clearRect:	 Area to clear.
+ * options:		 Bitflags to specify color/depth/stencil buffers for clearing.
+ * colors:		 An array of color values for the cleared color buffers.
+ * colorCount:	 The number of colors in the above array.
+ * depthStencil: Depth and stencil values for the cleared depth stencil buffer.
+ */
+REFRESHAPI void Refresh_Clear(
+	Refresh_Device *device,
+	Refresh_CommandBuffer *commandBuffer,
+	Refresh_Rect *clearRect,
+	Refresh_ClearOptions options,
+	Refresh_Vec4 *colors,
+	uint32_t colorCount,
+	Refresh_DepthStencilValue depthStencil
+);
+
 /* Draws data from vertex/index buffers with instancing enabled.
 *
 * baseVertex:			The starting offset to read from the vertex buffer.
@ -674,27 +685,6 @@ REFRESHAPI void Refresh_DrawPrimitives(
 	uint32_t fragmentParamOffset
 );

-/* Similar to Refresh_DrawPrimitives, but draw parameters are set from a buffer.
- * The buffer layout should match the layout of Refresh_IndirectDrawCommand.
- *
- * buffer:              A buffer containing draw parameters.
- * offsetInBytes:       The offset to start reading from the draw buffer.
- * drawCount:           The number of draw parameter sets that should be read from the draw buffer.
- * stride:              The byte stride between sets of draw parameters.
- * vertexParamOffset:   The offset of the vertex shader param data.
- * fragmentParamOffset:	The offset of the fragment shader param data.
- */
-REFRESHAPI void Refresh_DrawPrimitivesIndirect(
-	Refresh_Device *device,
-	Refresh_CommandBuffer *commandBuffer,
-	Refresh_Buffer *buffer,
-	uint32_t offsetInBytes,
-	uint32_t drawCount,
-	uint32_t stride,
-	uint32_t vertexParamOffset,
-	uint32_t fragmentParamOffset
-);
-
 /* Dispatches work compute items.
 *
 * groupCountX:			Number of local workgroups to dispatch in the X dimension.
@ -759,11 +749,6 @@ REFRESHAPI Refresh_Buffer* Refresh_CreateBuffer(
 /* Setters */

 /* Uploads image data to a texture object.
- *
- * NOTE:
- *	DO NOT expect this to execute in sequence relative to other commands!
- *	Calling SetTextureData in a command buffer that also references the
- *	texture may result in undefined behavior.
 *
 * 	textureSlice:		The texture slice to be updated.
 * 	data:				A pointer to the image data.
@ -786,13 +771,8 @@ REFRESHAPI void Refresh_SetTextureData(
 * yHeight:	The height of the Y plane.
 * uvWidth:	The width of the U/V planes.
 * uvHeight:	The height of the U/V planes.
- * yData:        A pointer to the raw Y image data.
- * uData:        A pointer to the raw U image data.
- * vData:        A pointer to the raw V image data.
- * yDataLength:  The size of the Y image data in bytes.
- * uvDataLength: The size of the UV image data in bytes.
- * yStride:      The length of a Y image data row in bytes.
- * uvStride:     The length of a UV image data row in bytes.
+ * data:	A pointer to the raw YUV image data.
+ * dataLength:	The size of the image data in bytes.
 */
 REFRESHAPI void Refresh_SetTextureDataYUV(
 	Refresh_Device *driverData,
@ -804,13 +784,8 @@ REFRESHAPI void Refresh_SetTextureDataYUV(
 	uint32_t yHeight,
 	uint32_t uvWidth,
 	uint32_t uvHeight,
-	void *yDataPtr,
-	void *uDataPtr,
-	void *vDataPtr,
-	uint32_t yDataLength,
-	uint32_t uvDataLength,
-	uint32_t yStride,
-	uint32_t uvStride
+	void* data,
+	uint32_t dataLength
 );

 /* Performs an asynchronous texture-to-texture copy.
@ -1009,6 +984,11 @@ REFRESHAPI void Refresh_QueueDestroyGraphicsPipeline(
 /* Begins a render pass.
 * This will also set a default viewport and scissor state.
 *
+ * renderArea:
+ * 		The area affected by the render pass.
+ * 		All load, store and resolve operations are restricted
+ * 		to the given rectangle.
+ * 		If NULL, a sensible default will be chosen.
 * colorAttachmentInfos:
 * 		A pointer to an array of Refresh_ColorAttachmentInfo structures
 * 		that contains render targets and clear values. May be NULL.
@ -1018,6 +998,7 @@ REFRESHAPI void Refresh_QueueDestroyGraphicsPipeline(
 REFRESHAPI void Refresh_BeginRenderPass(
 	Refresh_Device *device,
 	Refresh_CommandBuffer *commandBuffer,
+	Refresh_Rect *renderArea,
 	Refresh_ColorAttachmentInfo *colorAttachmentInfos,
 	uint32_t colorAttachmentCount,
 	Refresh_DepthStencilAttachmentInfo *depthStencilAttachmentInfo
@ -1050,9 +1031,7 @@ REFRESHAPI void Refresh_SetScissor(
 	Refresh_Rect *scissor
 );

-/* Binds vertex buffers for use with subsequent draw calls.
- * Note that this may only be called after binding a graphics pipeline.
- */
+/* Binds vertex buffers for use with subsequent draw calls. */
 REFRESHAPI void Refresh_BindVertexBuffers(
 	Refresh_Device *device,
 	Refresh_CommandBuffer *commandBuffer,
@ -1136,41 +1115,6 @@ REFRESHAPI void Refresh_BindComputeTextures(

 /* Submission/Presentation */

-/* Claims a window, creating a swapchain structure for it.
- * This function MUST be called before any swapchain functions
- * are called using the window.
- *
- * Returns 0 on swapchain creation failure.
- */
-REFRESHAPI uint8_t Refresh_ClaimWindow(
-	Refresh_Device *device,
-	void *windowHandle,
-	Refresh_PresentMode presentMode
-);
-
-/* Unclaims a window, destroying the swapchain structure for it.
- * It is good practice to call this when a window is closed to
- * prevent memory bloat, but windows are automatically unclaimed
- * by DestroyDevice.
- */
-REFRESHAPI void Refresh_UnclaimWindow(
-	Refresh_Device *device,
-	void *windowHandle
-);
-
-/* Changes the present mode of the swapchain for the given window. */
-REFRESHAPI void Refresh_SetSwapchainPresentMode(
-	Refresh_Device *device,
-	void *windowHandle,
-	Refresh_PresentMode presentMode
-);
-
-/* Returns the format of the swapchain for the given window. */
-REFRESHAPI Refresh_TextureFormat Refresh_GetSwapchainFormat(
-	Refresh_Device *device,
-	void *windowHandle
-);
-
 /* Returns an allocated Refresh_CommandBuffer* object.
 * This command buffer is managed by the implementation and
 * should NOT be freed by the user.
@ -1179,78 +1123,50 @@ REFRESHAPI Refresh_TextureFormat Refresh_GetSwapchainFormat(
 * 	A command buffer may only be used on the thread that
 * 	it was acquired on. Using it on any other thread is an error.
 *
+ * fixed:
+ * 	If a command buffer is designated as fixed, it can be
+ * 	acquired once, have commands recorded into it, and
+ * 	be re-submitted indefinitely.
+ *
 */
 REFRESHAPI Refresh_CommandBuffer* Refresh_AcquireCommandBuffer(
-	Refresh_Device *device
+	Refresh_Device *device,
+	uint8_t fixed
 );

 /* Acquires a texture to use for presentation.
 * May return NULL under certain conditions.
- * If NULL, the user must ensure to not use the texture.
+ * If NULL, the user must ensure to not present.
 * Once a swapchain texture is acquired,
 * it will automatically be presented on command buffer submission.
 *
 * NOTE:
 * 	It is not recommended to hold a reference to this texture long term.
- *
- * pWidth: A pointer to a uint32 that will be filled with the texture width.
- * pHeight: A pointer to a uint32 that will be filled with the texture height.
 */
 REFRESHAPI Refresh_Texture* Refresh_AcquireSwapchainTexture(
 	Refresh_Device *device,
 	Refresh_CommandBuffer *commandBuffer,
-	void *windowHandle,
-	uint32_t *pWidth,
-	uint32_t *pHeight
+	void *windowHandle
+);
+
+/* Returns the format of the swapchain for the given window. */
+REFRESHAPI Refresh_TextureFormat Refresh_GetSwapchainFormat(
+	Refresh_Device *device,
+	void *windowHandle
 );

 /* Submits all of the enqueued commands. */
 REFRESHAPI void Refresh_Submit(
 	Refresh_Device* device,
-	Refresh_CommandBuffer *commandBuffer
+	uint32_t commandBufferCount,
+	Refresh_CommandBuffer **pCommandBuffers
 );

-/* Submits a command buffer and acquires a fence.
- * You can use the fence to check if or wait until the command buffer has finished processing.
- * You are responsible for releasing this fence when you are done using it.
- */
-REFRESHAPI Refresh_Fence* Refresh_SubmitAndAcquireFence(
-	Refresh_Device* device,
-	Refresh_CommandBuffer *commandBuffer
-);
-
-/* Waits for the device to become idle. */
+/* Waits for all submissions to complete. */
 REFRESHAPI void Refresh_Wait(
 	Refresh_Device *device
 );

-/* Waits for given fences to be signaled.
- *
- * waitAll: If 0, waits for any fence to be signaled. If 1, waits for all fences to be signaled.
- * fenceCount: The number of fences being submitted.
- * pFences: An array of fences to be waited on.
- */
-REFRESHAPI void Refresh_WaitForFences(
-	Refresh_Device *device,
-	uint8_t waitAll,
-	uint32_t fenceCount,
-	Refresh_Fence **pFences
-);
-
-/* Check the status of a fence. 1 means the fence is signaled. */
-REFRESHAPI int Refresh_QueryFence(
-	Refresh_Device *device,
-	Refresh_Fence *fence
-);
-
-/* Allows the fence to be reused by future command buffer submissions.
- * If you do not release fences after acquiring them, you will cause unbounded resource growth.
- */
-REFRESHAPI void Refresh_ReleaseFence(
-	Refresh_Device *device,
-	Refresh_Fence *fence
-);
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
--- a/include/Refresh_Image.h
+++ b/include/Refresh_Image.h
@ -44,45 +44,44 @@
 extern "C" {
 #endif /* __cplusplus */

-/* Image Read API */
-
-/* Decodes image data into raw RGBA8 texture data.
+/* Decodes PNG data into raw RGBA8 texture data.
 *
 * w:		    Filled with the width of the image.
 * h:		    Filled with the height of the image.
- * len:			Filled with the length of pixel data in bytes.
+ * numChannels: Filled with the number of channels in the image.
 *
 * Returns a block of memory suitable for use with Refresh_SetTextureData2D.
 * Be sure to free the memory with Refresh_Image_Free after use!
 */
 REFRESHAPI uint8_t* Refresh_Image_Load(
-	uint8_t *bufferPtr,
-	int32_t bufferLength,
+	char const *filename,
 	int32_t *w,
 	int32_t *h,
-	int32_t *len
+	int32_t *numChannels
 );

-/* Frees memory returned by Refresh_Image_Load. Do NOT free the memory yourself!
+/* Frees memory returned by Refresh_Image_Load. (Do NOT free the memory yourself!)
 *
- * mem: A pointer previously returned by Refresh_Image_LoadPNG.
+ * mem: A pointer previously returned by Refresh_Image_Load.
 */
 REFRESHAPI void Refresh_Image_Free(uint8_t *mem);

 /* Image Write API */

-/* Returns a buffer of PNG encoded from RGBA8 color data.
+/* Encodes 32-bit color data into PNG data.
 *
+ * filename:    The filename that the image will be written to.
+ * w:	        The width of the PNG data.
+ * h:	        The height of the PNG data.
+ * bgra:		Whether the data is in BGRA8 format. Otherwise will assume RBGA8.
 * data:	    The raw color data.
- * w:		The width of the color data.
- * h:		The height of the color data.
- * len:		Filled with the length of PNG data in bytes.
 */
 REFRESHAPI void Refresh_Image_SavePNG(
-	const char* filename,
-	uint8_t* data,
+	char const *filename,
 	int32_t w,
-	int32_t h
+	int32_t h,
+	uint8_t bgra,
+	uint8_t *data
 );

 #ifdef __cplusplus
--- a/shadercompiler/Program.cs
+++ b/shadercompiler/Program.cs
@ -1,268 +0,0 @@
-using System;
-using System.IO;
-using System.Diagnostics;
-
-partial class Program
-{
-	struct CompileShaderData
-	{
-		public string glslPath;
-		public string outputDir;
-		public bool preserveTemp;
-		public bool vulkan;
-		public bool d3d11;
-		public bool ps5;
-	}
-
-	private static void DisplayHelpText()
-	{
-		Console.WriteLine("Usage: refreshc <path-to-glsl-source | directory-with-glsl-source-files>");
-		Console.WriteLine("Options:");
-		Console.WriteLine("  --vulkan           Emit shader compatible with the Refresh Vulkan backend");
-		Console.WriteLine("  --d3d11            Emit shader compatible with the Refresh D3D11 backend");
-		Console.WriteLine("  --ps5              Emit shader compatible with the Refresh PS5 backend");
-		Console.WriteLine("  --out dir          Write output file(s) to the directory `dir`");
-		Console.WriteLine("  --preserve-temp    Do not delete the temp directory after compilation. Useful for debugging.");
-	}
-
-	public static int Main(string[] args)
-	{
-		if (args.Length == 0)
-		{
-			DisplayHelpText();
-			return 1;
-		}
-
-		CompileShaderData data = new CompileShaderData();
-		string inputPath = null;
-
-		for (int i = 0; i < args.Length; i += 1)
-		{
-			switch (args[i])
-			{
-				case "--vulkan":
-					data.vulkan = true;
-					break;
-
-				case "--d3d11":
-					data.d3d11 = true;
-					break;
-
-				case "--ps5":
-					data.ps5 = true;
-					break;
-
-				case "--out":
-					i += 1;
-					data.outputDir = args[i];
-					break;
-
-				case "--preserve-temp":
-					data.preserveTemp = true;
-					break;
-
-				default:
-					if (inputPath == null)
-					{
-						inputPath = args[i];
-					}
-					else
-					{
-						Console.WriteLine($"refreshc: Unknown parameter {args[i]}");
-						return 1;
-					}
-					break;
-			}
-		}
-
-		if (!data.vulkan && !data.d3d11 && !data.ps5)
-		{
-			Console.WriteLine($"refreshc: No Refresh platforms selected!");
-			return 1;
-		}
-
-#if !PS5
-		if (data.ps5)
-		{
-			Console.WriteLine($"refreshc: `PS5` must be defined in the to target the PS5 backend!");
-			return 1;
-		}
-#endif
-
-		if (data.outputDir == null)
-		{
-			data.outputDir = Directory.GetCurrentDirectory();
-		}
-		else if (!Directory.Exists(data.outputDir))
-		{
-			Console.WriteLine($"refreshc: Output directory {data.outputDir} does not exist");
-			return 1;
-		}
-
-		if (Directory.Exists(inputPath))
-		{
-			// Loop over and compile each file in the directory
-			string[] files = Directory.GetFiles(inputPath);
-			foreach (string file in files)
-			{
-				Console.WriteLine($"Compiling {file}");
-				data.glslPath = file;
-				int res = CompileShader(ref data);
-				if (res != 0)
-				{
-					return res;
-				}
-			}
-		}
-		else
-		{
-			if (!File.Exists(inputPath))
-			{
-				Console.WriteLine($"refreshc: glsl source file or directory ({inputPath}) does not exist");
-				return 1;
-			}
-
-			data.glslPath = inputPath;
-			int res = CompileShader(ref data);
-			if (res != 0)
-			{
-				return res;
-			}
-		}
-
-		return 0;
-	}
-
-	static int CompileShader(ref CompileShaderData data)
-	{
-		int res = 0;
-		string shaderName = Path.GetFileNameWithoutExtension(data.glslPath);
-		string shaderType = Path.GetExtension(data.glslPath);
-
-		if (shaderType != ".vert" && shaderType != ".frag" && shaderType != ".comp")
-		{
-			Console.WriteLine("refreshc: Expected glsl source file with extension '.vert', '.frag', or '.comp'");
-			return 1;
-		}
-
-		// Create the temp directory, if needed
-		string tempDir = Path.Combine(Directory.GetCurrentDirectory(), "temp");
-		if (!Directory.Exists(tempDir))
-		{
-			Directory.CreateDirectory(tempDir);
-		}
-
-		// Compile to spirv
-		string spirvPath = Path.Combine(tempDir, $"{shaderName}.spv");
-		res = CompileGlslToSpirv(data.glslPath, shaderName, spirvPath);
-		if (res != 0)
-		{
-			goto cleanup;
-		}
-
-		if (data.d3d11 || data.ps5)
-		{
-			// Transpile to hlsl
-			string hlslPath = Path.Combine(tempDir, $"{shaderName}.hlsl");
-			res = TranslateSpirvToHlsl(spirvPath, hlslPath);
-			if (res != 0)
-			{
-				goto cleanup;
-			}
-
-			// FIXME: Is there a cross-platform way to compile HLSL to DXBC?
-
-#if PS5
-			// Transpile to ps5, if requested
-			if (data.ps5)
-			{
-				res = TranslateHlslToPS5(hlslPath, shaderName, shaderType, tempDir);
-				if (res != 0)
-				{
-					goto cleanup;
-				}
-			}
-#endif
-		}
-
-		// Create the output blob file
-		string outputFilepath = Path.Combine(data.outputDir, $"{shaderName}{shaderType}.refresh");
-		using (FileStream fs = File.Create(outputFilepath))
-		{
-			using (BinaryWriter writer = new BinaryWriter(fs))
-			{
-				// Magic
-				writer.Write(new char[] { 'R', 'F', 'S', 'H'});
-
-				if (data.vulkan)
-				{
-					string inputPath = Path.Combine(tempDir, $"{shaderName}.spv");
-					WriteShaderBlob(writer, inputPath, 1);
-				}
-
-#if PS5
-				if (data.ps5)
-				{
-					string ext = GetPS5ShaderFileExtension();
-					string inputPath = Path.Combine(tempDir, $"{shaderName}{ext}");
-					WriteShaderBlob(writer, inputPath, 2);
-				}
-#endif
-
-				if (data.d3d11)
-				{
-					string inputPath = Path.Combine(tempDir, $"{shaderName}.hlsl");
-					WriteShaderBlob(writer, inputPath, 3);
-				}
-			}
-		}
-
-	cleanup:
-		// Clean up the temp directory
-		if (!data.preserveTemp)
-		{
-			Directory.Delete(tempDir, true);
-		}
-		return res;
-	}
-
-	static void WriteShaderBlob(BinaryWriter writer, string inputPath, byte backend)
-	{
-		byte[] shaderBlob = File.ReadAllBytes(inputPath);
-		writer.Write(backend); // Corresponds to Refresh_Backend
-		writer.Write(shaderBlob.Length);
-		writer.Write(shaderBlob);
-	}
-
-	static int CompileGlslToSpirv(string glslPath, string shaderName, string outputPath)
-	{
-		Process glslc = Process.Start(
-			"glslc",
-			$"\"{glslPath}\" -o \"{outputPath}\""
-		);
-		glslc.WaitForExit();
-		if (glslc.ExitCode != 0)
-		{
-			Console.WriteLine($"refreshc: Could not compile GLSL code");
-			return 1;
-		}
-
-		return 0;
-	}
-
-	static int TranslateSpirvToHlsl(string spirvPath, string outputPath)
-	{
-		Process spirvcross = Process.Start(
-			"spirv-cross",
-			$"\"{spirvPath}\" --hlsl --shader-model 50 --output \"{outputPath}\""
-		);
-		spirvcross.WaitForExit();
-		if (spirvcross.ExitCode != 0)
-		{
-			Console.WriteLine($"refreshc: Could not translate SPIR-V to HLSL");
-			return 1;
-		}
-
-		return 0;
-	}
-}
--- a/shadercompiler/refreshc.csproj
+++ b/shadercompiler/refreshc.csproj
@ -1,10 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
-    <TargetName>refreshc</TargetName>
-	<PublishAot>true</PublishAot>
-  </PropertyGroup>
-
-</Project>
--- a/src/Refresh.c
+++ b/src/Refresh.c
@ -33,22 +33,9 @@

 /* Drivers */

-#ifdef REFRESH_DRIVER_VULKAN
-	#define VULKAN_DRIVER &VulkanDriver
-#else
-	#define VULKAN_DRIVER NULL
-#endif
-
-#ifdef REFRESH_DRIVER_PS5
-	#define PS5_DRIVER &PS5Driver
-#else
-	#define PS5_DRIVER NULL
-#endif
-
-static const Refresh_Driver *backends[] = {
-	NULL,
-	VULKAN_DRIVER,
-	PS5_DRIVER
+static const Refresh_Driver *drivers[] = {
+	&VulkanDriver,
+	NULL
 };

 /* Logging */
@ -137,55 +124,19 @@ uint32_t Refresh_LinkedVersion(void)

 /* Driver Functions */

-static Refresh_Backend selectedBackend = REFRESH_BACKEND_INVALID;
-
-Refresh_Backend Refresh_SelectBackend(Refresh_Backend preferredBackend, uint32_t *flags)
-{
-	uint32_t i;
-
-	if (preferredBackend != REFRESH_BACKEND_DONTCARE)
-	{
-		if (backends[preferredBackend] == NULL)
-		{
-			Refresh_LogWarn("Preferred backend was not compiled into this binary! Attempting to fall back!");
-		}
-		else if (backends[preferredBackend]->PrepareDriver(flags))
-		{
-			selectedBackend = preferredBackend;
-			return selectedBackend;
-		}
-	}
-
-	/* Iterate until we find an appropriate backend. */
-
-	for (i = 1; i < SDL_arraysize(backends); i += 1)
-	{
-		if (i != preferredBackend && backends[i] != NULL && backends[i]->PrepareDriver(flags))
-		{
-			selectedBackend = i;
-			return i;
-		}
-	}
-
-	if (backends[i] == NULL)
-	{
-		Refresh_LogError("No supported Refresh backend found!");
-	}
-
-	selectedBackend = REFRESH_BACKEND_INVALID;
-	return REFRESH_BACKEND_INVALID;
-}
+static int32_t selectedDriver = 0;

 Refresh_Device* Refresh_CreateDevice(
+	Refresh_PresentationParameters *presentationParameters,
 	uint8_t debugMode
 ) {
-	if (selectedBackend == REFRESH_BACKEND_INVALID)
+	if (selectedDriver < 0)
 	{
-		Refresh_LogError("Invalid backend selection. Did you call Refresh_SelectBackend?");
 		return NULL;
 	}

-	return backends[selectedBackend]->CreateDevice(
+	return drivers[selectedDriver]->CreateDevice(
+		presentationParameters,
 		debugMode
 	);
 }
@ -196,6 +147,27 @@ void Refresh_DestroyDevice(Refresh_Device *device)
 	device->DestroyDevice(device);
 }

+void Refresh_Clear(
+	Refresh_Device *device,
+	Refresh_CommandBuffer *commandBuffer,
+	Refresh_Rect *clearRect,
+	Refresh_ClearOptions options,
+	Refresh_Vec4 *colors,
+	uint32_t colorCount,
+	Refresh_DepthStencilValue depthStencil
+) {
+	NULL_RETURN(device);
+	device->Clear(
+		device->driverData,
+		commandBuffer,
+		clearRect,
+		options,
+		colors,
+		colorCount,
+		depthStencil
+	);
+}
+
 void Refresh_DrawIndexedPrimitives(
 	Refresh_Device *device,
 	Refresh_CommandBuffer *commandBuffer,
@ -259,29 +231,6 @@ void Refresh_DrawPrimitives(
 	);
 }

-void Refresh_DrawPrimitivesIndirect(
-	Refresh_Device *device,
-	Refresh_CommandBuffer *commandBuffer,
-	Refresh_Buffer *buffer,
-	uint32_t offsetInBytes,
-	uint32_t drawCount,
-	uint32_t stride,
-	uint32_t vertexParamOffset,
-	uint32_t fragmentParamOffset
-) {
-	NULL_RETURN(device);
-	device->DrawPrimitivesIndirect(
-		device->driverData,
-		commandBuffer,
-		buffer,
-		offsetInBytes,
-		drawCount,
-		stride,
-		vertexParamOffset,
-		fragmentParamOffset
-	);
-}
-
 void Refresh_DispatchCompute(
 	Refresh_Device *device,
 	Refresh_CommandBuffer *commandBuffer,
@ -338,52 +287,10 @@ Refresh_ShaderModule* Refresh_CreateShaderModule(
 	Refresh_Device *device,
 	Refresh_ShaderModuleCreateInfo *shaderModuleCreateInfo
 ) {
-	Refresh_ShaderModuleCreateInfo driverSpecificCreateInfo = { 0, NULL };
-	uint8_t *bytes;
-	uint32_t i, size;
-
 	NULL_RETURN_NULL(device);
-
-	/* verify the magic number in the shader blob header */
-	bytes = (uint8_t*) shaderModuleCreateInfo->byteCode;
-	if (bytes[0] != 'R' || bytes[1] != 'F' || bytes[2] != 'S' || bytes[3] != 'H')
-	{
-		Refresh_LogError("Cannot parse malformed Refresh shader blob!");
-		return NULL;
-	}
-
-	/* find the code for the selected backend */
-	i = 4;
-	while (i < shaderModuleCreateInfo->codeSize)
-	{
-		size = *((uint32_t*) &bytes[i + 1]);
-
-		if (bytes[i] == (uint8_t) selectedBackend)
-		{
-			driverSpecificCreateInfo.codeSize = size;
-			driverSpecificCreateInfo.byteCode = (uint32_t*) &bytes[i + 1 + sizeof(uint32_t)];
-			break;
-		}
-		else
-		{
-			/* skip over the backend byte, the blob size, and the blob */
-			i += 1 + sizeof(uint32_t) + size;
-		}
-	}
-
-	/* verify the shader blob supports the selected backend */
-	if (driverSpecificCreateInfo.byteCode == NULL)
-	{
-		Refresh_LogError(
-			"Cannot create shader module that does not contain shader code for the selected backend! "
-			"Recompile your shader and enable this backend."
-		);
-		return NULL;
-	}
-
 	return device->CreateShaderModule(
 		device->driverData,
-		&driverSpecificCreateInfo
+		shaderModuleCreateInfo
 	);
 }

@ -438,13 +345,8 @@ void Refresh_SetTextureDataYUV(
 	uint32_t yHeight,
 	uint32_t uvWidth,
 	uint32_t uvHeight,
-	void *yDataPtr,
-	void *uDataPtr,
-	void *vDataPtr,
-	uint32_t yDataLength,
-	uint32_t uvDataLength,
-	uint32_t yStride,
-	uint32_t uvStride
+	void* data,
+	uint32_t dataLength
 ) {
 	NULL_RETURN(device);
 	device->SetTextureDataYUV(
@ -457,13 +359,8 @@ void Refresh_SetTextureDataYUV(
 		yHeight,
 		uvWidth,
 		uvHeight,
-		yDataPtr,
-		uDataPtr,
-		vDataPtr,
-		yDataLength,
-		uvDataLength,
-		yStride,
-		uvStride
+		data,
+		dataLength
 	);
 }

@ -677,6 +574,7 @@ void Refresh_QueueDestroyGraphicsPipeline(
 void Refresh_BeginRenderPass(
 	Refresh_Device *device,
 	Refresh_CommandBuffer *commandBuffer,
+	Refresh_Rect *renderArea,
 	Refresh_ColorAttachmentInfo *colorAttachmentInfos,
 	uint32_t colorAttachmentCount,
 	Refresh_DepthStencilAttachmentInfo *depthStencilAttachmentInfo
@ -685,6 +583,7 @@ void Refresh_BeginRenderPass(
 	device->BeginRenderPass(
 		device->driverData,
 		commandBuffer,
+		renderArea,
 		colorAttachmentInfos,
 		colorAttachmentCount,
 		depthStencilAttachmentInfo
@ -816,53 +715,27 @@ void Refresh_BindComputeTextures(
 	);
 }

-uint8_t Refresh_ClaimWindow(
-	Refresh_Device *device,
-	void *windowHandle,
-	Refresh_PresentMode presentMode
-) {
-	if (device == NULL) { return 0; }
-	return device->ClaimWindow(
-		device->driverData,
-		windowHandle,
-		presentMode
-	);
-}
-
-void Refresh_UnclaimWindow(
-	Refresh_Device *device,
-	void *windowHandle
-) {
-	NULL_RETURN(device);
-	device->UnclaimWindow(
-		device->driverData,
-		windowHandle
-	);
-}
-
 Refresh_CommandBuffer* Refresh_AcquireCommandBuffer(
-	Refresh_Device *device
+	Refresh_Device *device,
+	uint8_t fixed
 ) {
 	NULL_RETURN_NULL(device);
 	return device->AcquireCommandBuffer(
-		device->driverData
+		device->driverData,
+		fixed
 	);
 }

 Refresh_Texture* Refresh_AcquireSwapchainTexture(
 	Refresh_Device *device,
 	Refresh_CommandBuffer *commandBuffer,
-	void *windowHandle,
-	uint32_t *pWidth,
-	uint32_t *pHeight
+	void *windowHandle
 ) {
 	NULL_RETURN_NULL(device);
 	return device->AcquireSwapchainTexture(
 		device->driverData,
 		commandBuffer,
-		windowHandle,
-		pWidth,
-		pHeight
+		windowHandle
 	);
 }

@ -877,38 +750,16 @@ Refresh_TextureFormat Refresh_GetSwapchainFormat(
 	);
 }

-void Refresh_SetSwapchainPresentMode(
-	Refresh_Device *device,
-	void *windowHandle,
-	Refresh_PresentMode presentMode
-) {
-	NULL_RETURN(device);
-	device->SetSwapchainPresentMode(
-		device->driverData,
-		windowHandle,
-		presentMode
-	);
-}
-
 void Refresh_Submit(
 	Refresh_Device *device,
-	Refresh_CommandBuffer *commandBuffer
+	uint32_t commandBufferCount,
+	Refresh_CommandBuffer **pCommandBuffers
 ) {
 	NULL_RETURN(device);
 	device->Submit(
 		device->driverData,
-		commandBuffer
-	);
-}
-
-Refresh_Fence* Refresh_SubmitAndAcquireFence(
-	Refresh_Device *device,
-	Refresh_CommandBuffer *commandBuffer
-) {
-	NULL_RETURN_NULL(device);
-	return device->SubmitAndAcquireFence(
-		device->driverData,
-		commandBuffer
+		commandBufferCount,
+		pCommandBuffers
 	);
 }

@ -921,44 +772,4 @@ void Refresh_Wait(
 	);
 }

-void Refresh_WaitForFences(
-	Refresh_Device *device,
-	uint8_t waitAll,
-	uint32_t fenceCount,
-	Refresh_Fence **pFences
-) {
-	NULL_RETURN(device);
-	device->WaitForFences(
-		device->driverData,
-		waitAll,
-		fenceCount,
-		pFences
-	);
-}
-
-int Refresh_QueryFence(
-	Refresh_Device *device,
-	Refresh_Fence *fence
-) {
-	if (device == NULL) {
-		return 0;
-	}
-
-	return device->QueryFence(
-		device->driverData,
-		fence
-	);
-}
-
-void Refresh_ReleaseFence(
-	Refresh_Device *device,
-	Refresh_Fence *fence
-) {
-	NULL_RETURN(device);
-	device->ReleaseFence(
-		device->driverData,
-		fence
-	);
-}
-
 /* vim: set noexpandtab shiftwidth=8 tabstop=8: */
--- a/src/Refresh_Driver.h
+++ b/src/Refresh_Driver.h
@ -36,15 +36,9 @@

 /* Logging */

-#ifdef __cplusplus
-extern "C" {
-#endif
-void Refresh_LogInfo(const char *fmt, ...);
-void Refresh_LogWarn(const char *fmt, ...);
-void Refresh_LogError(const char *fmt, ...);
-#ifdef __cplusplus
-}
-#endif
+extern void Refresh_LogInfo(const char *fmt, ...);
+extern void Refresh_LogWarn(const char *fmt, ...);
+extern void Refresh_LogError(const char *fmt, ...);

 /* Internal Helper Utilities */

@ -57,31 +51,24 @@ static inline uint32_t Texture_GetFormatSize(
 			return 8;
 		case REFRESH_TEXTUREFORMAT_BC2:
 		case REFRESH_TEXTUREFORMAT_BC3:
-		case REFRESH_TEXTUREFORMAT_BC7:
 			return 16;
 		case REFRESH_TEXTUREFORMAT_R8:
-		case REFRESH_TEXTUREFORMAT_R8_UINT:
 			return 1;
 		case REFRESH_TEXTUREFORMAT_R5G6B5:
 		case REFRESH_TEXTUREFORMAT_B4G4R4A4:
 		case REFRESH_TEXTUREFORMAT_A1R5G5B5:
 		case REFRESH_TEXTUREFORMAT_R16_SFLOAT:
 		case REFRESH_TEXTUREFORMAT_R8G8_SNORM:
-		case REFRESH_TEXTUREFORMAT_R8G8_UINT:
-		case REFRESH_TEXTUREFORMAT_R16_UINT:
 			return 2;
 		case REFRESH_TEXTUREFORMAT_R8G8B8A8:
 		case REFRESH_TEXTUREFORMAT_R32_SFLOAT:
 		case REFRESH_TEXTUREFORMAT_R16G16_SFLOAT:
 		case REFRESH_TEXTUREFORMAT_R8G8B8A8_SNORM:
 		case REFRESH_TEXTUREFORMAT_A2R10G10B10:
-		case REFRESH_TEXTUREFORMAT_R8G8B8A8_UINT:
-		case REFRESH_TEXTUREFORMAT_R16G16_UINT:
 			return 4;
 		case REFRESH_TEXTUREFORMAT_R16G16B16A16_SFLOAT:
 		case REFRESH_TEXTUREFORMAT_R16G16B16A16:
 		case REFRESH_TEXTUREFORMAT_R32G32_SFLOAT:
-		case REFRESH_TEXTUREFORMAT_R16G16B16A16_UINT:
 			return 8;
 		case REFRESH_TEXTUREFORMAT_R32G32B32A32_SFLOAT:
 			return 16;
@ -130,8 +117,7 @@ static inline uint32_t BytesPerRow(

 	if (	format == REFRESH_TEXTUREFORMAT_BC1 ||
 		format == REFRESH_TEXTUREFORMAT_BC2 ||
-		format == REFRESH_TEXTUREFORMAT_BC3 ||
-		format == REFRESH_TEXTUREFORMAT_BC7	)
+		format == REFRESH_TEXTUREFORMAT_BC3	)
 	{
 		blocksPerRow = (width + 3) / 4;
 	}
@ -149,8 +135,7 @@ static inline int32_t BytesPerImage(

 	if (	format == REFRESH_TEXTUREFORMAT_BC1 ||
 		format == REFRESH_TEXTUREFORMAT_BC2 ||
-		format == REFRESH_TEXTUREFORMAT_BC3 ||
-		format == REFRESH_TEXTUREFORMAT_BC7 )
+		format == REFRESH_TEXTUREFORMAT_BC3	)
 	{
 		blocksPerRow = (width + 3) / 4;
 		blocksPerColumn = (height + 3) / 4;
@ -183,6 +168,16 @@ struct Refresh_Device

 	/* Drawing */

+	void (*Clear)(
+		Refresh_Renderer *driverData,
+		Refresh_CommandBuffer *commandBuffer,
+		Refresh_Rect *clearRect,
+		Refresh_ClearOptions options,
+		Refresh_Vec4 *colors,
+		uint32_t colorCount,
+		Refresh_DepthStencilValue depthStencil
+	);
+
 	void (*DrawInstancedPrimitives)(
 		Refresh_Renderer *driverData,
 		Refresh_CommandBuffer *commandBuffer,
@ -213,17 +208,6 @@ struct Refresh_Device
 		uint32_t fragmentParamOffset
 	);

-	void (*DrawPrimitivesIndirect)(
-		Refresh_Renderer *driverData,
-		Refresh_CommandBuffer *commandBuffer,
-		Refresh_Buffer *buffer,
-		uint32_t offsetInBytes,
-		uint32_t drawCount,
-		uint32_t stride,
-		uint32_t vertexParamOffset,
-		uint32_t fragmentParamOffset
-	);
-
 	void (*DispatchCompute)(
 		Refresh_Renderer *device,
 		Refresh_CommandBuffer *commandBuffer,
@ -286,13 +270,8 @@ struct Refresh_Device
 		uint32_t yHeight,
 		uint32_t uvWidth,
 		uint32_t uvHeight,
-		void *yDataPtr,
-		void *uDataPtr,
-		void *vDataPtr,
-		uint32_t yDataLength,
-		uint32_t uvDataLength,
-		uint32_t yStride,
-		uint32_t uvStride
+		void* data,
+		uint32_t dataLength
 	);

 	void(*CopyTextureToTexture)(
@ -400,6 +379,7 @@ struct Refresh_Device
 	void(*BeginRenderPass)(
 		Refresh_Renderer *driverData,
 		Refresh_CommandBuffer *commandBuffer,
+		Refresh_Rect *renderArea,
 		Refresh_ColorAttachmentInfo *colorAttachmentInfos,
 		uint32_t colorAttachmentCount,
 		Refresh_DepthStencilAttachmentInfo *depthStencilAttachmentInfo
@ -463,27 +443,15 @@ struct Refresh_Device
 		Refresh_Texture **pTextures
 	);

-	uint8_t (*ClaimWindow)(
-		Refresh_Renderer *driverData,
-		void *windowHandle,
-		Refresh_PresentMode presentMode
-	);
-
-	void (*UnclaimWindow)(
-		Refresh_Renderer *driverData,
-		void *windowHandle
-	);
-
 	Refresh_CommandBuffer* (*AcquireCommandBuffer)(
-		Refresh_Renderer *driverData
+		Refresh_Renderer *driverData,
+		uint8_t fixed
 	);

 	Refresh_Texture* (*AcquireSwapchainTexture)(
 		Refresh_Renderer *driverData,
 		Refresh_CommandBuffer *commandBuffer,
-		void *windowHandle,
-		uint32_t *pWidth,
-		uint32_t *pHeight
+		void *windowHandle
 	);

 	Refresh_TextureFormat (*GetSwapchainFormat)(
@ -491,43 +459,16 @@ struct Refresh_Device
 		void *windowHandle
 	);

-	void (*SetSwapchainPresentMode)(
-		Refresh_Renderer *driverData,
-		void *windowHandle,
-		Refresh_PresentMode presentMode
-	);
-
 	void(*Submit)(
 		Refresh_Renderer *driverData,
-		Refresh_CommandBuffer *commandBuffer
-	);
-
-	Refresh_Fence* (*SubmitAndAcquireFence)(
-		Refresh_Renderer *driverData,
-		Refresh_CommandBuffer *commandBuffer
+		uint32_t commandBufferCount,
+		Refresh_CommandBuffer **pCommandBuffers
 	);

 	void(*Wait)(
 		Refresh_Renderer *driverData
 	);

-	void (*WaitForFences)(
-		Refresh_Renderer *driverData,
-		uint8_t waitAll,
-		uint32_t fenceCount,
-		Refresh_Fence **pFences
-	);
-
-	int (*QueryFence)(
-		Refresh_Renderer *driverData,
-		Refresh_Fence *fence
-	);
-
-	void (*ReleaseFence)(
-		Refresh_Renderer *driverData,
-		Refresh_Fence *fence
-	);
-
 	/* Opaque pointer for the Driver */
 	Refresh_Renderer *driverData;
 };
@ -536,10 +477,10 @@ struct Refresh_Device
 	result->func = name##_##func;
 #define ASSIGN_DRIVER(name) \
 	ASSIGN_DRIVER_FUNC(DestroyDevice, name) \
+	ASSIGN_DRIVER_FUNC(Clear, name) \
 	ASSIGN_DRIVER_FUNC(DrawIndexedPrimitives, name) \
 	ASSIGN_DRIVER_FUNC(DrawInstancedPrimitives, name) \
 	ASSIGN_DRIVER_FUNC(DrawPrimitives, name) \
-	ASSIGN_DRIVER_FUNC(DrawPrimitivesIndirect, name) \
 	ASSIGN_DRIVER_FUNC(DispatchCompute, name) \
 	ASSIGN_DRIVER_FUNC(CreateComputePipeline, name) \
 	ASSIGN_DRIVER_FUNC(CreateGraphicsPipeline, name) \
@ -574,30 +515,22 @@ struct Refresh_Device
 	ASSIGN_DRIVER_FUNC(BindComputePipeline, name) \
 	ASSIGN_DRIVER_FUNC(BindComputeBuffers, name) \
 	ASSIGN_DRIVER_FUNC(BindComputeTextures, name) \
-	ASSIGN_DRIVER_FUNC(ClaimWindow, name) \
-	ASSIGN_DRIVER_FUNC(UnclaimWindow, name) \
 	ASSIGN_DRIVER_FUNC(AcquireCommandBuffer, name) \
 	ASSIGN_DRIVER_FUNC(AcquireSwapchainTexture, name) \
 	ASSIGN_DRIVER_FUNC(GetSwapchainFormat, name) \
-	ASSIGN_DRIVER_FUNC(SetSwapchainPresentMode, name) \
 	ASSIGN_DRIVER_FUNC(Submit, name) \
-	ASSIGN_DRIVER_FUNC(SubmitAndAcquireFence, name) \
-	ASSIGN_DRIVER_FUNC(Wait, name) \
-	ASSIGN_DRIVER_FUNC(WaitForFences, name) \
-	ASSIGN_DRIVER_FUNC(QueryFence, name) \
-	ASSIGN_DRIVER_FUNC(ReleaseFence, name)
+	ASSIGN_DRIVER_FUNC(Wait, name)

 typedef struct Refresh_Driver
 {
 	const char *Name;
-	uint8_t (*PrepareDriver)(uint32_t *flags);
 	Refresh_Device* (*CreateDevice)(
+		Refresh_PresentationParameters *presentationParameters,
 		uint8_t debugMode
 	);
 } Refresh_Driver;

 extern Refresh_Driver VulkanDriver;
-extern Refresh_Driver PS5Driver;

 #endif /* REFRESH_DRIVER_H */

--- a/src/Refresh_Driver_Template.txt
+++ b/src/Refresh_Driver_Template.txt
@ -126,7 +126,11 @@ static TEMPLATE_BLEND_FACTOR_TYPE RefreshToTEMPLATE_BlendFactor[] =
 	0,	/* ONE_MINUS_DST_ALPHA */
 	0,	/* CONSTANT_COLOR */
 	0,	/* ONE_MINUS_CONSTANT_COLOR */
-	0	/* SRC_ALPHA_SATURATE */
+	0,	/* SRC_ALPHA_SATURATE */
+	0,	/* SRC1_COLOR */
+	0,	/* ONE_MINUS_SRC1_COLOR */
+	0,	/* SRC1_ALPHA */
+	0	/* ONE_MINUS_SRC1_ALPHA */
 };

 static TEMPLATE_BLEND_OP_TYPE RefreshToTEMPLATE_BlendOp[] =
@ -232,6 +236,18 @@ static void TEMPLATE_DestroyDevice(

 /* Drawing */

+static void TEMPLATE_Clear(
+	Refresh_Renderer *driverData,
+	Refresh_CommandBuffer *commandBuffer,
+	Refresh_Rect *clearRect,
+	Refresh_ClearOptions options,
+	Refresh_Vec4 *colors,
+	uint32_t colorCount,
+	Refresh_DepthStencilValue depthStencil
+) {
+	NOT_IMPLEMENTED
+}
+
 static void TEMPLATE_DrawInstancedPrimitives(
 	Refresh_Renderer *driverData,
 	Refresh_CommandBuffer *commandBuffer,
@ -268,19 +284,6 @@ static void TEMPLATE_DrawPrimitives(
 	NOT_IMPLEMENTED
 }

-static void TEMPLATE_DrawPrimitivesIndirect(
-	Refresh_Renderer *driverData,
-	Refresh_CommandBuffer *commandBuffer,
-	Refresh_Buffer *buffer,
-	uint32_t offsetInBytes,
-	uint32_t drawCount,
-	uint32_t stride,
-	uint32_t vertexParamOffset,
-	uint32_t fragmentParamOffset
-) {
-	NOT_IMPLEMENTED
-}
-
 static void TEMPLATE_DispatchCompute(
 	Refresh_Renderer *device,
 	Refresh_CommandBuffer *commandBuffer,
@ -360,13 +363,8 @@ static void TEMPLATE_SetTextureDataYUV(
 	uint32_t yHeight,
 	uint32_t uvWidth,
 	uint32_t uvHeight,
-	void *yDataPtr,
-	void *uDataPtr,
-	void *vDataPtr,
-	uint32_t yDataLength,
-	uint32_t uvDataLength,
-	uint32_t yStride,
-	uint32_t uvStride
+	void* data,
+	uint32_t dataLength
 ) {
 	NOT_IMPLEMENTED
 }
@ -503,15 +501,10 @@ static void TEMPLATE_QueueDestroyGraphicsPipeline(

 /* Graphics State */

-static Refresh_CommandBuffer* TEMPLATE_AcquireCommandBuffer(
-	Refresh_Renderer *driverData
-) {
-	NOT_IMPLEMENTED
-}
-
 static void TEMPLATE_BeginRenderPass(
 	Refresh_Renderer *driverData,
 	Refresh_CommandBuffer *commandBuffer,
+	Refresh_Rect *renderArea,
 	Refresh_ColorAttachmentInfo *colorAttachmentInfos,
 	uint32_t colorAttachmentCount,
 	Refresh_DepthStencilAttachmentInfo *depthStencilAttachmentInfo
@ -571,8 +564,6 @@ static void TEMPLATE_BindIndexBuffer(
 	NOT_IMPLEMENTED
 }

-/* Compute State */
-
 static void TEMPLATE_BindComputePipeline(
 	Refresh_Renderer *driverData,
 	Refresh_CommandBuffer *commandBuffer,
@ -597,60 +588,32 @@ static void TEMPLATE_BindComputeTextures(
 	NOT_IMPLEMENTED
 }

-/* Window and Swapchain Management */
-
-static uint8_t TEMPLATE_ClaimWindow(
+static Refresh_CommandBuffer* TEMPLATE_AcquireCommandBuffer(
 	Refresh_Renderer *driverData,
-	void *windowHandle,
-	Refresh_PresentMode presentMode
+	uint8_t fixed
 ) {
 	NOT_IMPLEMENTED
 }

-static void TEMPLATE_UnclaimWindow(
-	Refresh_Renderer *driverData,
-	void *windowHandle
-) {
-	NOT_IMPLEMENTED
-}
-
-static Refresh_Texture* TEMPLATE_AcquireSwapchainTexture(
+Refresh_Texture* TEMPLATE_AcquireSwapchainTexture(
 	Refresh_Renderer *driverData,
 	Refresh_CommandBuffer *commandBuffer,
-	void *windowHandle,
-	uint32_t *pWidth,
-	uint32_t *pHeight
-) {
-	NOT_IMPLEMENTED
-}
-
-static Refresh_TextureFormat TEMPLATE_GetSwapchainFormat(
-	Refresh_Renderer *driverData,
 	void *windowHandle
 ) {
 	NOT_IMPLEMENTED
 }

-static void TEMPLATE_SetSwapchainPresentMode(
+Refresh_TextureFormat TEMPLATE_GetSwapchainFormat(
 	Refresh_Renderer *driverData,
-	void *windowHandle,
-	Refresh_PresentMode presentMode
+	void *windowHandle
 ) {
 	NOT_IMPLEMENTED
 }

-/* Submission and Fences */
-
 static void TEMPLATE_Submit(
 	Refresh_Renderer *driverData,
-	Refresh_CommandBuffer *commandBuffer
-) {
-	NOT_IMPLEMENTED
-}
-
-static Refresh_Fence* TEMPLATE_SubmitAndAcquireFence(
-	Refresh_Renderer *driverData,
-	Refresh_CommandBuffer *commandBuffer
+	uint32_t commandBufferCount,
+	Refresh_CommandBuffer **pCommandBuffers
 ) {
 	NOT_IMPLEMENTED
 }
@ -661,38 +624,8 @@ static void TEMPLATE_Wait(
 	NOT_IMPLEMENTED
 }

-static void TEMPLATE_WaitForFences(
-	Refresh_Renderer *driverData,
-	uint8_t waitAll,
-	uint32_t fenceCount,
-	Refresh_Fence **pFences
-) {
-	NOT_IMPLEMENTED
-}
-
-static int TEMPLATE_QueryFence(
-	Refresh_Renderer *driverData,
-	Refresh_Fence *fence
-) {
-	NOT_IMPLEMENTED
-}
-
-static void TEMPLATE_ReleaseFence(
-	Refresh_Renderer *driverData,
-	Refresh_Fence *fence
-) {
-	NOT_IMPLEMENTED
-}
-
-/* Device Creation */
-
-static uint8_t TEMPLATE_PrepareDriver(
-	uint32_t *flags
-) {
-	NOT_IMPLEMENTED
-}
-
 static Refresh_Device* TEMPLATE_CreateDevice(
+	Refresh_PresentationParameters *presentationParameters,
 	uint8_t debugMode
 ) {
 	NOT_IMPLEMENTED
@ -700,7 +633,6 @@ static Refresh_Device* TEMPLATE_CreateDevice(

 Refresh_Driver TEMPLATEDriver = {
 	"TEMPLATE",
-	TEMPLATE_PrepareDriver,
 	TEMPLATE_CreateDevice
 };

--- a/src/Refresh_Driver_Vulkan.c
+++ b/src/Refresh_Driver_Vulkan.c
--- a/src/Refresh_Driver_Vulkan_vkfuncs.h
+++ b/src/Refresh_Driver_Vulkan_vkfuncs.h
@ -89,11 +89,9 @@ VULKAN_DEVICE_FUNCTION(BaseVK, void, vkCmdClearDepthStencilImage, (VkCommandBuff
 VULKAN_DEVICE_FUNCTION(BaseVK, void, vkCmdCopyBuffer, (VkCommandBuffer commandBuffer, VkBuffer srcBuffer, VkBuffer dstBuffer, uint32_t regionCount, const VkBufferCopy* pRegions))
 VULKAN_DEVICE_FUNCTION(BaseVK, void, vkCmdCopyBufferToImage, (VkCommandBuffer commandBuffer, VkBuffer srcBuffer, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkBufferImageCopy *pRegions))
 VULKAN_DEVICE_FUNCTION(BaseVK, void, vkCmdCopyImageToBuffer, (VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkBuffer dstBuffer, uint32_t regionCount, const VkBufferImageCopy *pRegions))
-VULKAN_DEVICE_FUNCTION(BaseVK, void, vkCmdCopyImage, (VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageCopy* pRegions))
 VULKAN_DEVICE_FUNCTION(BaseVK, void, vkCmdDispatch, (VkCommandBuffer commandBuffer, uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ))
 VULKAN_DEVICE_FUNCTION(BaseVK, void, vkCmdDraw, (VkCommandBuffer commandBuffer, uint32_t vertexCount, uint32_t instanceCount, uint32_t firstVertex, uint32_t firstInstance))
 VULKAN_DEVICE_FUNCTION(BaseVK, void, vkCmdDrawIndexed, (VkCommandBuffer commandBuffer, uint32_t indexCount, uint32_t instanceCount, uint32_t firstIndex, int32_t vertexOffset, uint32_t firstInstance))
-VULKAN_DEVICE_FUNCTION(BaseVK, void, vkCmdDrawIndirect, (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t drawCount, uint32_t stride))
 VULKAN_DEVICE_FUNCTION(BaseVK, void, vkCmdEndRenderPass, (VkCommandBuffer commandBuffer))
 VULKAN_DEVICE_FUNCTION(BaseVK, void, vkCmdPipelineBarrier, (VkCommandBuffer commandBuffer, VkPipelineStageFlags srcStageMask, VkPipelineStageFlags dstStageMask, VkDependencyFlags dependencyFlags, uint32_t memoryBarrierCount, const VkMemoryBarrier *pMemoryBarriers, uint32_t bufferMemoryBarrierCount, const VkBufferMemoryBarrier *pBufferMemoryBarriers, uint32_t imageMemoryBarrierCount, const VkImageMemoryBarrier *pImageMemoryBarriers))
 VULKAN_DEVICE_FUNCTION(BaseVK, void, vkCmdResolveImage, (VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageResolve *pRegions))
--- a/src/Refresh_Image.c
+++ b/src/Refresh_Image.c
@ -48,6 +48,7 @@
 #define floorf SDL_floorf
 #define ldexp SDL_scalbn
 #define pow SDL_pow
+#define strtol SDL_strtol

 #ifdef memcmp
 #undef memcmp
@ -73,10 +74,13 @@
 #undef strlen
 #endif
 #define strlen SDL_strlen
+#ifdef strncmp
+#undef strncmp
+#endif
+#define strncmp SDL_strncmp

 /* These are per the Texture2D.FromStream spec */
 #define STBI_ONLY_PNG
-#define STBI_ONLY_QOI

 /* These are per the Texture2D.SaveAs* spec */
 #define STBIW_ONLY_PNG
@ -136,7 +140,6 @@ SDL_SIMDRealloc(void *mem, const size_t len)
 #endif

 #define STB_IMAGE_STATIC
-#define STBI_NO_HDR
 #define STBI_ASSERT SDL_assert
 #define STBI_MALLOC SDL_SIMDAlloc
 #define STBI_REALLOC SDL_SIMDRealloc
@ -187,72 +190,51 @@ static unsigned char* dgibson_stbi_zlib_compress(
 /* Image Read API */

 uint8_t* Refresh_Image_Load(
-	uint8_t *bufferPtr,
-	int32_t bufferLength,
+	char const *filename,
 	int32_t *w,
 	int32_t *h,
-	int32_t *len
+	int32_t *numChannels
 ) {
-	uint8_t* result;
-	uint8_t* pixels;
-	int32_t format;
-	int32_t i;
-
-	result = stbi_load_from_memory(
-		bufferPtr,
-		bufferLength,
-		w,
-		h,
-		&format,
-		STBI_rgb_alpha
-	);
-
-	if (result == NULL)
-	{
-		SDL_LogWarn(SDL_LOG_CATEGORY_ERROR, "Image loading failed: %s", stbi_failure_reason());
-	}
-
-	/* Ensure that the alpha pixels are... well, actual alpha.
-	 * You think this looks stupid, but be assured: Your paint program is
-	 * almost certainly even stupider.
-	 * -flibit
-	 */
-	pixels = result;
-	*len = (*w) * (*h) *4;
-	for (i = 0; i < *len; i += 4, pixels += 4)
-	{
-		if (pixels[3] == 0)
-		{
-			pixels[0] = 0;
-			pixels[1] = 1;
-			pixels[2] = 2;
-		}
-	}
-
-	return result;
+	return stbi_load(filename, w, h, numChannels, STBI_rgb_alpha);
 }

 void Refresh_Image_Free(uint8_t *mem)
 {
-	SDL_SIMDFree(mem);
+	stbi_image_free(mem);
 }

 /* Image Write API */

 void Refresh_Image_SavePNG(
 	const char *filename,
-	uint8_t* data,
 	int32_t w,
-	int32_t h
+	int32_t h,
+	uint8_t bgra,
+	uint8_t *data
 ) {
-	stbi_write_png(
-		filename,
-		w,
-		h,
-		4,
-		data,
-		w * 4
-	);
+	uint32_t i;
+	uint8_t *bgraData;
+
+	if (bgra)
+	{
+		bgraData = SDL_malloc(w * h * 4);
+
+		for (i = 0; i < w * h * 4; i += 4)
+		{
+			bgraData[i]     = data[i + 2];
+			bgraData[i + 1] = data[i + 1];
+			bgraData[i + 2] = data[i];
+			bgraData[i + 3] = data[i + 3];
+		}
+
+		stbi_write_png(filename, w, h, 4, bgraData, w * 4);
+
+		SDL_free(bgraData);
+	}
+	else
+	{
+		stbi_write_png(filename, w, h, 4, data, w * 4);
+	}
 }

 /* vim: set noexpandtab shiftwidth=8 tabstop=8: */
--- a/src/stb_image.h
+++ b/src/stb_image.h
Author	SHA1	Message	Date
cosmonaut	bd5957d17c	Merge branch 'main' into updatetemplate	2022-03-07 08:01:10 +00:00
Caleb Cornett	3fc639d0ba	Removed logic ops and enum values from the template	2022-03-05 09:46:08 -05:00
Caleb Cornett	11dd37c9e0	Update template for latest ABI breaks	2022-03-05 09:37:26 -05:00