Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions loader/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ CC = ppc-amigaos-gcc
CFLAGS = -mcrt=newlib -O2 -Wall -Iinclude -Iinclude/include_h \
-D__NOLIBBASE__ -D__NOGLOBALIFACE__
LDFLAGS = -mcrt=newlib -nostartfiles
DEBUG :=

SOURCES = src/loader_main.c src/loader_dispatch.c src/loader_icd.c src/loader_wsi.c
TARGET = ../build/vulkan.library
Expand Down
1 change: 1 addition & 0 deletions ogles2_icd/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ CC = ppc-amigaos-gcc
CFLAGS = -mcrt=newlib -O2 -Wall \
-D__NOLIBBASE__ -D__NOGLOBALIFACE__
LDFLAGS = -mcrt=newlib -nostartfiles
DEBUG :=

TARGET = ../build/ogles2_vk.library

Expand Down
3 changes: 2 additions & 1 deletion ogles2_icd/Makefile.cross
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ CFLAGS = -mcrt=newlib -O2 -mstrict-align $(DEBUG) -Iinclude -Wall \
-D__NOLIBBASE__ -D__NOGLOBALIFACE__
LDFLAGS = -mcrt=newlib -nostartfiles
DEBUG :=

SDK = /usr/ppc-amigaos/SDK/include/include_h
SPVC_DIR = external/spirv-cross
SPVC_SRCS = spirv_cfg.cpp spirv_cross_parsed_ir.cpp spirv_cross.cpp \
Expand Down Expand Up @@ -96,6 +97,6 @@ $(TARGET):


clean:
rm -f build/swvk_*.o build/software_vk.library
rm -f build/*


6 changes: 6 additions & 0 deletions ogles2_icd/include/ogles2vk_internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@
#include <vulkan/vulkan.h>
#include <vulkan/vk_icd.h>

#ifdef DEBUG
#define D(x) IExec->DebugPrintF x
#else
#define D(x) do {} while(0)
#endif

/*------------------------------------------------------------------------
** Version info
**----------------------------------------------------------------------*/
Expand Down
8 changes: 4 additions & 4 deletions ogles2_icd/src/ogles2vk_cmdbuf.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ static OGLES2VKCommand *ogles2vk_CmdAppend(OGLES2VKCommandBuffer *cmd, OGLES2VKC
{
if (cmd->commandCount >= OGLES2VK_MAX_COMMANDS)
{
IExec->DebugPrintF("[ogles2_vk] WARNING: command buffer full (%u/%u)\n",
(unsigned)cmd->commandCount, (unsigned)OGLES2VK_MAX_COMMANDS);
D(("[ogles2_vk] WARNING: command buffer full (%u/%u)\n",
(unsigned)cmd->commandCount, (unsigned)OGLES2VK_MAX_COMMANDS));
return NULL;
}

Expand Down Expand Up @@ -167,8 +167,8 @@ VkResult ogles2vk_EndCommandBuffer(VkCommandBuffer commandBuffer)
OGLES2VKCommandBuffer *cmd = (OGLES2VKCommandBuffer *)commandBuffer;
cmd->recording = 0;

IExec->DebugPrintF("[ogles2_vk] Command buffer recorded: %lu commands\n",
(unsigned long)cmd->commandCount);
D(("[ogles2_vk] Command buffer recorded: %lu commands\n",
(unsigned long)cmd->commandCount));
return VK_SUCCESS;
}

Expand Down
Loading