bilbo/d3d10
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

print: use WriteConsoleA for debug output

Browse Source
This commit is contained in:
Zack Buhman 2026-01-13 16:40:57 -06:00
parent 20cb55a63e
commit 82660a3bc1
3 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -2,6 +2,7 @@ BUILD_TYPE ?= debug
ifeq ($(BUILD_TYPE),debug) ifeq ($(BUILD_TYPE),debug)
OPT = -g -Og OPT = -g -Og
CFLAGS += -D_DEBUG
LDOPT = LDOPT =
else else
OPT = -O2 OPT = -O2

16
src/main.cpp
View File

@ -60,13 +60,8 @@ ID3D10EffectShaderResourceVariable * g_pDiffuseAVariableBloom = NULL;
ID3D10EffectVectorVariable * g_pInvScreenSizeVariableBloom = NULL; ID3D10EffectVectorVariable * g_pInvScreenSizeVariableBloom = NULL;
ID3D10EffectVectorVariable * g_pDirVariableBloom = NULL; ID3D10EffectVectorVariable * g_pDirVariableBloom = NULL;
ID3D10EffectScalarVariable * g_pExposureVariableBloom = NULL; ID3D10EffectScalarVariable * g_pExposureVariableBloom = NULL;
#ifdef _DEBUG
int g_bloomPasses = 0;
float g_exposure = 3.7f;
#else
int g_bloomPasses = 4; int g_bloomPasses = 4;
float g_exposure = 3.4f; float g_exposure = 3.4f;
#endif
typedef XMFLOAT2 BloomVertex; typedef XMFLOAT2 BloomVertex;
@ -908,11 +903,7 @@ HRESULT InitDirect3DDevice()
D3D10_RASTERIZER_DESC RSDesc; D3D10_RASTERIZER_DESC RSDesc;
RSDesc.FillMode = D3D10_FILL_SOLID; RSDesc.FillMode = D3D10_FILL_SOLID;
#ifdef _DEBUG
RSDesc.CullMode = D3D10_CULL_BACK; RSDesc.CullMode = D3D10_CULL_BACK;
#else
RSDesc.CullMode = D3D10_CULL_NONE;
#endif
RSDesc.FrontCounterClockwise = FALSE; RSDesc.FrontCounterClockwise = FALSE;
RSDesc.DepthBias = 0; RSDesc.DepthBias = 0;
RSDesc.SlopeScaledDepthBias = 0.0f; RSDesc.SlopeScaledDepthBias = 0.0f;
@ -1584,16 +1575,11 @@ void RenderVolumeMesh()
void Render() void Render()
{ {
static float t = 0.0f;
#ifdef _DEBUG
t += XM_PI * 0.0125f * 0.5f;
#else
static DWORD dwTimeStart = 0; static DWORD dwTimeStart = 0;
DWORD dwTimeCur = GetTickCount(); DWORD dwTimeCur = GetTickCount();
if (dwTimeStart == 0) if (dwTimeStart == 0)
dwTimeStart = dwTimeCur; dwTimeStart = dwTimeCur;
t = (dwTimeCur - dwTimeStart) / 1000.0f; float t = (dwTimeCur - dwTimeStart) / 1000.0f;
#endif
Update(t); Update(t);

19
src/print.cpp
View File

@ -8,7 +8,7 @@ void print(LPCSTR fmt, ...)
va_list args; va_list args;
va_start(args, fmt); va_start(args, fmt);
char buf[512]; char buf[512];
STRSAFE_LPSTR end; STRSAFE_LPSTR end = NULL;
StringCbVPrintfExA(buf, StringCbVPrintfExA(buf,
(sizeof (buf)), (sizeof (buf)),
@ -19,11 +19,11 @@ void print(LPCSTR fmt, ...)
args); args);
va_end(args); va_end(args);
#ifdef _DEBUG #ifdef _DEBUG
OutputDebugStringA(buf); //OutputDebugStringA(buf);
size_t length = end - &buf[0];
HANDLE hOutput = GetStdHandle(STD_OUTPUT_HANDLE);
WriteConsoleA(hOutput, buf, (DWORD)length, NULL, NULL);
#endif #endif
//size_t length = end - &buf[0];
//HANDLE hOutput = GetStdHandle(STD_OUTPUT_HANDLE);
//WriteConsoleA(hOutput, buf, (DWORD)length, NULL, NULL);
} }
void printW(LPCWSTR fmt, ...) void printW(LPCWSTR fmt, ...)
@ -31,15 +31,20 @@ void printW(LPCWSTR fmt, ...)
va_list args; va_list args;
va_start(args, fmt); va_start(args, fmt);
WCHAR buf[512]; WCHAR buf[512];
STRSAFE_LPWSTR end = NULL;
StringCbVPrintfExW(buf, StringCbVPrintfExW(buf,
(sizeof (buf)), (sizeof (buf)),
NULL, &end,
NULL, NULL,
STRSAFE_NULL_ON_FAILURE, STRSAFE_NULL_ON_FAILURE,
fmt, fmt,
args); args);
va_end(args); va_end(args);
#ifdef _DEBUG #ifdef _DEBUG
OutputDebugStringW(buf); //OutputDebugStringW(buf);
size_t length = end - &buf[0];
HANDLE hOutput = GetStdHandle(STD_OUTPUT_HANDLE);
WriteConsoleW(hOutput, buf, (DWORD)length, NULL, NULL);
#endif #endif
} }