diff --git a/inc/dd.h b/inc/dd.h index 7aca2ef..8d6ef39 100644 --- a/inc/dd.h +++ b/inc/dd.h @@ -81,7 +81,6 @@ typedef struct CNCDDRAW DWORD minfps_tick_len; int width; int height; - int bpp; int opengl_y_align; HDC hdc; diff --git a/inc/render_d3d9.h b/inc/render_d3d9.h index d1c52a0..2de021c 100644 --- a/inc/render_d3d9.h +++ b/inc/render_d3d9.h @@ -23,7 +23,6 @@ typedef struct D3D9RENDERER IDirect3DPixelShader9* pixel_shader_upscale; float scale_w; float scale_h; - int bits_per_pixel; int tex_width; int tex_height; } D3D9RENDERER; diff --git a/src/config.c b/src/config.c index 0b124dd..b2a2be8 100644 --- a/src/config.c +++ b/src/config.c @@ -139,13 +139,6 @@ void cfg_load() 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 */ cfg_get_string("shader", "Shaders\\cubic\\catmull-rom-bilinear.glsl", g_ddraw->shader, sizeof(g_ddraw->shader)); diff --git a/src/dd.c b/src/dd.c index 815cf17..e98f485 100644 --- a/src/dd.c +++ b/src/dd.c @@ -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.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) { /* 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.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; SetPixelFormat(g_ddraw->render.hdc, ChoosePixelFormat(g_ddraw->render.hdc, &pfd), &pfd); diff --git a/src/render_d3d9.c b/src/render_d3d9.c index f582c57..5413120 100644 --- a/src/render_d3d9.c +++ b/src/render_d3d9.c @@ -117,8 +117,6 @@ BOOL d3d9_create() TRACE("+------------------------------------------------\n"); } #endif - - g_d3d9.bits_per_pixel = g_ddraw->render.bpp ? g_ddraw->render.bpp : g_ddraw->mode.dmBitsPerPel; g_d3d9.hwnd = g_ddraw->hwnd; 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.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.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; DWORD behavior_flags[] = { @@ -174,7 +172,7 @@ BOOL d3d9_reset(BOOL windowed) g_d3d9.params.Windowed = windowed; g_d3d9.params.BackBufferWidth = windowed ? 0 : g_ddraw->render.width; 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))) {