backup/cnc-ddraw
1
0
Fork 0
mirror of https://github.com/FunkyFr3sh/cnc-ddraw.git synced 2025-03-15 06:04:49 +01:00
Code Issues Projects Releases Activity

remove bpp setting

Browse Source
This commit is contained in:
FunkyFr3sh 2023-08-01 03:06:09 +02:00
parent 81294dbecf
commit cddf2524d2
5 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
inc/dd.h
View File

@ -81,7 +81,6 @@ typedef struct CNCDDRAW
DWORD minfps_tick_len; DWORD minfps_tick_len;
int width; int width;
int height; int height;
int bpp;
int opengl_y_align; int opengl_y_align;
HDC hdc; HDC hdc;

1
inc/render_d3d9.h
View File

@ -23,7 +23,6 @@ typedef struct D3D9RENDERER
IDirect3DPixelShader9* pixel_shader_upscale; IDirect3DPixelShader9* pixel_shader_upscale;
float scale_w; float scale_w;
float scale_h; float scale_h;
int bits_per_pixel;
int tex_width; int tex_width;
int tex_height; int tex_height;
} D3D9RENDERER; } D3D9RENDERER;

7
src/config.c
View File

@ -139,13 +139,6 @@ void cfg_load()
SetProcessAffinityMask(proc, system_affinity); SetProcessAffinityMask(proc, system_affinity);
} }
g_ddraw->render.bpp = cfg_get_int("bpp", 0);
if (g_ddraw->render.bpp != 16 && g_ddraw->render.bpp != 24 && g_ddraw->render.bpp != 32)
{
g_ddraw->render.bpp = 0;
}
/* to do: read .glslp config file instead of the shader and apply the correct settings */ /* to do: read .glslp config file instead of the shader and apply the correct settings */
cfg_get_string("shader", "Shaders\\cubic\\catmull-rom-bilinear.glsl", g_ddraw->shader, sizeof(g_ddraw->shader)); cfg_get_string("shader", "Shaders\\cubic\\catmull-rom-bilinear.glsl", g_ddraw->shader, sizeof(g_ddraw->shader));

8
src/dd.c
View File

@ -567,12 +567,6 @@ HRESULT dd_SetDisplayMode(DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwFl
g_ddraw->render.mode.dmPelsWidth = g_ddraw->render.width; g_ddraw->render.mode.dmPelsWidth = g_ddraw->render.width;
g_ddraw->render.mode.dmPelsHeight = g_ddraw->render.height; g_ddraw->render.mode.dmPelsHeight = g_ddraw->render.height;
if (g_ddraw->render.bpp)
{
g_ddraw->render.mode.dmFields |= DM_BITSPERPEL;
g_ddraw->render.mode.dmBitsPerPel = g_ddraw->render.bpp;
}
if (!g_ddraw->windowed) if (!g_ddraw->windowed)
{ {
/* Making sure the chosen resolution is valid */ /* Making sure the chosen resolution is valid */
@ -951,7 +945,7 @@ HRESULT dd_SetCooperativeLevel(HWND hwnd, DWORD dwFlags)
PFD_DRAW_TO_WINDOW | PFD_DOUBLEBUFFER | (g_ddraw->renderer == ogl_render_main ? PFD_SUPPORT_OPENGL : 0); PFD_DRAW_TO_WINDOW | PFD_DOUBLEBUFFER | (g_ddraw->renderer == ogl_render_main ? PFD_SUPPORT_OPENGL : 0);
pfd.iPixelType = PFD_TYPE_RGBA; pfd.iPixelType = PFD_TYPE_RGBA;
pfd.cColorBits = g_ddraw->render.bpp ? g_ddraw->render.bpp : g_ddraw->mode.dmBitsPerPel; pfd.cColorBits = g_ddraw->mode.dmBitsPerPel;
pfd.iLayerType = PFD_MAIN_PLANE; pfd.iLayerType = PFD_MAIN_PLANE;
SetPixelFormat(g_ddraw->render.hdc, ChoosePixelFormat(g_ddraw->render.hdc, &pfd), &pfd); SetPixelFormat(g_ddraw->render.hdc, ChoosePixelFormat(g_ddraw->render.hdc, &pfd), &pfd);

6
src/render_d3d9.c
View File

@ -117,8 +117,6 @@ BOOL d3d9_create()
TRACE("+------------------------------------------------\n"); TRACE("+------------------------------------------------\n");
} }
#endif #endif
g_d3d9.bits_per_pixel = g_ddraw->render.bpp ? g_ddraw->render.bpp : g_ddraw->mode.dmBitsPerPel;
g_d3d9.hwnd = g_ddraw->hwnd; g_d3d9.hwnd = g_ddraw->hwnd;
memset(&g_d3d9.params, 0, sizeof(g_d3d9.params)); memset(&g_d3d9.params, 0, sizeof(g_d3d9.params));
@ -129,7 +127,7 @@ BOOL d3d9_create()
g_d3d9.params.PresentationInterval = g_ddraw->vsync ? D3DPRESENT_INTERVAL_ONE : D3DPRESENT_INTERVAL_IMMEDIATE; g_d3d9.params.PresentationInterval = g_ddraw->vsync ? D3DPRESENT_INTERVAL_ONE : D3DPRESENT_INTERVAL_IMMEDIATE;
g_d3d9.params.BackBufferWidth = g_d3d9.params.Windowed ? 0 : g_ddraw->render.width; g_d3d9.params.BackBufferWidth = g_d3d9.params.Windowed ? 0 : g_ddraw->render.width;
g_d3d9.params.BackBufferHeight = g_d3d9.params.Windowed ? 0 : g_ddraw->render.height; g_d3d9.params.BackBufferHeight = g_d3d9.params.Windowed ? 0 : g_ddraw->render.height;
g_d3d9.params.BackBufferFormat = g_d3d9.bits_per_pixel == 16 ? D3DFMT_R5G6B5 : D3DFMT_X8R8G8B8; g_d3d9.params.BackBufferFormat = g_ddraw->mode.dmBitsPerPel == 16 ? D3DFMT_R5G6B5 : D3DFMT_X8R8G8B8;
g_d3d9.params.BackBufferCount = 1; g_d3d9.params.BackBufferCount = 1;
DWORD behavior_flags[] = { DWORD behavior_flags[] = {
@ -174,7 +172,7 @@ BOOL d3d9_reset(BOOL windowed)
g_d3d9.params.Windowed = windowed; g_d3d9.params.Windowed = windowed;
g_d3d9.params.BackBufferWidth = windowed ? 0 : g_ddraw->render.width; g_d3d9.params.BackBufferWidth = windowed ? 0 : g_ddraw->render.width;
g_d3d9.params.BackBufferHeight = windowed ? 0 : g_ddraw->render.height; g_d3d9.params.BackBufferHeight = windowed ? 0 : g_ddraw->render.height;
g_d3d9.params.BackBufferFormat = g_d3d9.bits_per_pixel == 16 ? D3DFMT_R5G6B5 : D3DFMT_X8R8G8B8; g_d3d9.params.BackBufferFormat = g_ddraw->mode.dmBitsPerPel == 16 ? D3DFMT_R5G6B5 : D3DFMT_X8R8G8B8;
if (g_d3d9.device && SUCCEEDED(IDirect3DDevice9_Reset(g_d3d9.device, &g_d3d9.params))) if (g_d3d9.device && SUCCEEDED(IDirect3DDevice9_Reset(g_d3d9.device, &g_d3d9.params)))
{ {