KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gallium/gdi: use GALLIUM_FOO rather than HAVE_FOO 

This matches what other targets do, and makes it easier to port to
meson.

Signed-off-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
This commit is contained in:
Erik Faye-Lund 2019-08-07 13:42:36 +02:00 committed by Dylan Baker
parent 9e1f49aae1
commit 9c57b54994
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gallium/targets/libgl-gdi/SConscript
View File

@ -32,11 +32,11 @@ if True:
drivers += [softpipe]
if env['llvm']:
env.Append(CPPDEFINES = 'HAVE_LLVMPIPE')
env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE')
drivers += [llvmpipe]
if env['swr']:
env.Append(CPPDEFINES = 'HAVE_SWR')
env.Append(CPPDEFINES = 'GALLIUM_SWR')
drivers += [swr]
if env['gcc'] and env['machine'] != 'x86_64':

16
src/gallium/targets/libgl-gdi/libgl_gdi.c
View File

@ -45,13 +45,13 @@
#include "softpipe/sp_screen.h"
#include "softpipe/sp_public.h"
#ifdef HAVE_LLVMPIPE
#ifdef GALLIUM_LLVMPIPE
#include "llvmpipe/lp_texture.h"
#include "llvmpipe/lp_screen.h"
#include "llvmpipe/lp_public.h"
#endif
#ifdef HAVE_SWR
#ifdef GALLIUM_SWR
#include "swr/swr_public.h"
#endif
@ -70,9 +70,9 @@ gdi_screen_create(void)
if(!winsys)
goto no_winsys;
#ifdef HAVE_LLVMPIPE
#ifdef GALLIUM_LLVMPIPE
default_driver = "llvmpipe";
#elif HAVE_SWR
#elif GALLIUM_SWR
default_driver = "swr";
#else
default_driver = "softpipe";
@ -80,14 +80,14 @@ gdi_screen_create(void)
driver = debug_get_option("GALLIUM_DRIVER", default_driver);
#ifdef HAVE_LLVMPIPE
#ifdef GALLIUM_LLVMPIPE
if (strcmp(driver, "llvmpipe") == 0) {
screen = llvmpipe_create_screen( winsys );
if (screen)
use_llvmpipe = TRUE;
}
#endif
#ifdef HAVE_SWR
#ifdef GALLIUM_SWR
if (strcmp(driver, "swr") == 0) {
screen = swr_create_screen( winsys );
if (screen)
@ -130,7 +130,7 @@ gdi_present(struct pipe_screen *screen,
struct sw_winsys *winsys = NULL;
struct sw_displaytarget *dt = NULL;
#ifdef HAVE_LLVMPIPE
#ifdef GALLIUM_LLVMPIPE
if (use_llvmpipe) {
winsys = llvmpipe_screen(screen)->winsys;
dt = llvmpipe_resource(res)->dt;
@ -139,7 +139,7 @@ gdi_present(struct pipe_screen *screen,
}
#endif
#ifdef HAVE_SWR
#ifdef GALLIUM_SWR
if (use_swr) {
swr_gdi_swap(screen, res, hDC);
return;