gallium: fix llvmpipe after winsys move
This commit is contained in:
@@ -30,10 +30,10 @@
|
|||||||
#include "util/u_memory.h"
|
#include "util/u_memory.h"
|
||||||
#include "util/u_math.h"
|
#include "util/u_math.h"
|
||||||
|
|
||||||
#include "lp_winsys.h"
|
|
||||||
#include "lp_screen.h"
|
#include "lp_screen.h"
|
||||||
#include "lp_buffer.h"
|
#include "lp_buffer.h"
|
||||||
|
|
||||||
|
#include "state_tracker/sw_winsys.h"
|
||||||
|
|
||||||
static void *
|
static void *
|
||||||
llvmpipe_buffer_map(struct pipe_screen *screen,
|
llvmpipe_buffer_map(struct pipe_screen *screen,
|
||||||
|
@@ -34,12 +34,13 @@
|
|||||||
#include "lp_texture.h"
|
#include "lp_texture.h"
|
||||||
#include "lp_buffer.h"
|
#include "lp_buffer.h"
|
||||||
#include "lp_fence.h"
|
#include "lp_fence.h"
|
||||||
#include "lp_winsys.h"
|
|
||||||
#include "lp_jit.h"
|
#include "lp_jit.h"
|
||||||
#include "lp_screen.h"
|
#include "lp_screen.h"
|
||||||
#include "lp_context.h"
|
#include "lp_context.h"
|
||||||
#include "lp_debug.h"
|
#include "lp_debug.h"
|
||||||
|
|
||||||
|
#include "state_tracker/sw_winsys.h"
|
||||||
|
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
int LP_DEBUG = 0;
|
int LP_DEBUG = 0;
|
||||||
|
|
||||||
|
@@ -76,4 +76,7 @@ llvmpipe_screen( struct pipe_screen *pipe )
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
struct pipe_screen *
|
||||||
|
llvmpipe_create_screen(struct sw_winsys *winsys);
|
||||||
|
|
||||||
#endif /* LP_SCREEN_H */
|
#endif /* LP_SCREEN_H */
|
||||||
|
@@ -46,7 +46,7 @@
|
|||||||
#include "lp_rast.h"
|
#include "lp_rast.h"
|
||||||
#include "lp_setup_context.h"
|
#include "lp_setup_context.h"
|
||||||
#include "lp_screen.h"
|
#include "lp_screen.h"
|
||||||
#include "lp_winsys.h"
|
#include "state_tracker/sw_winsys.h"
|
||||||
|
|
||||||
#include "draw/draw_context.h"
|
#include "draw/draw_context.h"
|
||||||
#include "draw/draw_vbuf.h"
|
#include "draw/draw_vbuf.h"
|
||||||
|
@@ -42,7 +42,7 @@
|
|||||||
#include "lp_screen.h"
|
#include "lp_screen.h"
|
||||||
#include "lp_texture.h"
|
#include "lp_texture.h"
|
||||||
#include "lp_tile_size.h"
|
#include "lp_tile_size.h"
|
||||||
#include "lp_winsys.h"
|
#include "state_tracker/sw_winsys.h"
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -41,13 +41,14 @@
|
|||||||
#if defined(GALLIUM_LLVMPIPE)
|
#if defined(GALLIUM_LLVMPIPE)
|
||||||
|
|
||||||
#include "llvmpipe/lp_texture.h"
|
#include "llvmpipe/lp_texture.h"
|
||||||
#include "llvmpipe/lp_winsys.h"
|
#include "llvmpipe/lp_screen.h"
|
||||||
#include "state_tracker/sw_winsys.h"
|
#include "state_tracker/sw_winsys.h"
|
||||||
|
#include "util/u_debug.h"
|
||||||
|
|
||||||
static struct pipe_screen *
|
static struct pipe_screen *
|
||||||
xlib_create_llvmpipe_screen( void )
|
xlib_create_llvmpipe_screen( void )
|
||||||
{
|
{
|
||||||
struct llvmpipe_winsys *winsys;
|
struct sw_winsys *winsys;
|
||||||
struct pipe_screen *screen;
|
struct pipe_screen *screen;
|
||||||
|
|
||||||
winsys = xlib_create_sw_winsys();
|
winsys = xlib_create_sw_winsys();
|
||||||
|
@@ -31,6 +31,7 @@
|
|||||||
#include "softpipe/sp_texture.h"
|
#include "softpipe/sp_texture.h"
|
||||||
#include "softpipe/sp_screen.h"
|
#include "softpipe/sp_screen.h"
|
||||||
#include "state_tracker/sw_winsys.h"
|
#include "state_tracker/sw_winsys.h"
|
||||||
|
#include "util/u_debug.h"
|
||||||
|
|
||||||
static struct pipe_screen *
|
static struct pipe_screen *
|
||||||
xlib_create_softpipe_screen( void )
|
xlib_create_softpipe_screen( void )
|
||||||
|
Reference in New Issue
Block a user