ws/i965: renames from i915, hook up makefiles
This commit is contained in:
Keith Whitwell
@@ -1,7 +1,7 @@
|
||||
TOP = ../../../../../..
|
||||
include $(TOP)/configs/current
|
||||
|
||||
LIBNAME = i915_dri.so
|
||||
LIBNAME = i965_dri.so
|
||||
|
||||
PIPE_DRIVERS = \
|
||||
$(TOP)/src/gallium/state_trackers/dri/libdridrm.a \
|
||||
@@ -9,7 +9,7 @@ PIPE_DRIVERS = \
|
||||
$(TOP)/src/gallium/drivers/trace/libtrace.a \
|
||||
$(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
|
||||
$(TOP)/src/gallium/drivers/identity/libidentity.a \
|
||||
$(TOP)/src/gallium/drivers/i915/libi915.a
|
||||
$(TOP)/src/gallium/drivers/i965/libi965.a
|
||||
|
||||
|
||||
DRIVER_SOURCES =
|
||||
@@ -24,4 +24,4 @@ DRI_LIB_DEPS += -ldrm_intel
|
||||
|
||||
symlinks: $(TOP)/$(LIB_DIR)/gallium
|
||||
@rm -f $(TOP)/$(LIB_DIR)/gallium/i965_dri.so
|
||||
ln -s i915_dri.so $(TOP)/$(LIB_DIR)/gallium/i965_dri.so
|
||||
ln -s i965_dri.so $(TOP)/$(LIB_DIR)/gallium/i965_dri.so
|
||||
|
||||
@@ -6,14 +6,13 @@ env.ParseConfig('pkg-config --cflags --libs libdrm_intel')
|
||||
|
||||
drivers = [
|
||||
st_dri,
|
||||
inteldrm,
|
||||
softpipe,
|
||||
i915,
|
||||
i965drm,
|
||||
i965,
|
||||
trace,
|
||||
]
|
||||
|
||||
env.LoadableModule(
|
||||
target ='i915_dri.so',
|
||||
target ='i965_dri.so',
|
||||
source = COMMON_GALLIUM_SOURCES,
|
||||
LIBS = drivers + mesa + auxiliaries + env['LIBS'],
|
||||
SHLIBPREFIX = '',
|
||||
|
||||
@@ -2,14 +2,14 @@ TOP = ../../../../../..
|
||||
GALLIUMDIR = ../../../..
|
||||
include $(TOP)/configs/current
|
||||
|
||||
LIBNAME = EGL_i915.so
|
||||
LIBNAME = EGL_i965.so
|
||||
|
||||
PIPE_DRIVERS = \
|
||||
$(TOP)/src/gallium/state_trackers/egl/libegldrm.a \
|
||||
$(GALLIUMDIR)/winsys/drm/intel/gem/libinteldrm.a \
|
||||
$(GALLIUMDIR)/winsys/drm/i965/gem/libi965drm.a \
|
||||
$(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
|
||||
$(TOP)/src/gallium/drivers/trace/libtrace.a \
|
||||
$(TOP)/src/gallium/drivers/i915/libi915.a
|
||||
$(TOP)/src/gallium/drivers/i965/libi965.a
|
||||
|
||||
DRIVER_SOURCES =
|
||||
|
||||
|
||||
@@ -4,10 +4,10 @@ include $(TOP)/configs/current
|
||||
LIBNAME = inteldrm
|
||||
|
||||
C_SOURCES = \
|
||||
intel_drm_batchbuffer.c \
|
||||
intel_drm_buffer.c \
|
||||
intel_drm_fence.c \
|
||||
intel_drm_api.c
|
||||
i965_drm_batchbuffer.c \
|
||||
i965_drm_buffer.c \
|
||||
i965_drm_fence.c \
|
||||
i965_drm_api.c
|
||||
|
||||
LIBRARY_INCLUDES = $(shell pkg-config libdrm --cflags-only-I)
|
||||
|
||||
|
||||
@@ -2,16 +2,16 @@ Import('*')
|
||||
|
||||
env = drienv.Clone()
|
||||
|
||||
inteldrm_sources = [
|
||||
'intel_drm_api.c',
|
||||
'intel_drm_batchbuffer.c',
|
||||
'intel_drm_buffer.c',
|
||||
'intel_drm_fence.c',
|
||||
i965drm_sources = [
|
||||
'i965_drm_api.c',
|
||||
'i965_drm_batchbuffer.c',
|
||||
'i965_drm_buffer.c',
|
||||
'i965_drm_fence.c',
|
||||
]
|
||||
|
||||
inteldrm = env.ConvenienceLibrary(
|
||||
target ='inteldrm',
|
||||
source = inteldrm_sources,
|
||||
i965drm = env.ConvenienceLibrary(
|
||||
target ='i965drm',
|
||||
source = i965drm_sources,
|
||||
)
|
||||
|
||||
Export('inteldrm')
|
||||
Export('i965drm')
|
||||
|
||||
@@ -0,0 +1,209 @@
|
||||
|
||||
#include "state_tracker/drm_api.h"
|
||||
|
||||
#include "i965_drm_winsys.h"
|
||||
#include "util/u_memory.h"
|
||||
|
||||
#include "brw/brw_context.h" /* XXX: shouldn't be doing this */
|
||||
#include "brw/brw_screen.h" /* XXX: shouldn't be doing this */
|
||||
|
||||
#include "trace/tr_drm.h"
|
||||
|
||||
/*
|
||||
* Helper functions
|
||||
*/
|
||||
|
||||
|
||||
static void
|
||||
i965_drm_get_device_id(unsigned int *device_id)
|
||||
{
|
||||
char path[512];
|
||||
FILE *file;
|
||||
void *shutup_gcc;
|
||||
|
||||
/*
|
||||
* FIXME: Fix this up to use a drm ioctl or whatever.
|
||||
*/
|
||||
|
||||
snprintf(path, sizeof(path), "/sys/class/drm/card0/device/device");
|
||||
file = fopen(path, "r");
|
||||
if (!file) {
|
||||
return;
|
||||
}
|
||||
|
||||
shutup_gcc = fgets(path, sizeof(path), file);
|
||||
sscanf(path, "%x", device_id);
|
||||
fclose(file);
|
||||
}
|
||||
|
||||
static struct i965_buffer *
|
||||
i965_drm_buffer_from_handle(struct i965_drm_winsys *idws,
|
||||
const char* name, unsigned handle)
|
||||
{
|
||||
struct i965_drm_buffer *buf = CALLOC_STRUCT(i965_drm_buffer);
|
||||
uint32_t tile = 0, swizzle = 0;
|
||||
|
||||
if (!buf)
|
||||
return NULL;
|
||||
|
||||
buf->magic = 0xDEAD1337;
|
||||
buf->bo = drm_i965_bo_gem_create_from_name(idws->pools.gem, name, handle);
|
||||
buf->flinked = TRUE;
|
||||
buf->flink = handle;
|
||||
|
||||
if (!buf->bo)
|
||||
goto err;
|
||||
|
||||
drm_i965_bo_get_tiling(buf->bo, &tile, &swizzle);
|
||||
if (tile != I965_TILE_NONE)
|
||||
buf->map_gtt = TRUE;
|
||||
|
||||
return (struct i965_buffer *)buf;
|
||||
|
||||
err:
|
||||
FREE(buf);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Exported functions
|
||||
*/
|
||||
|
||||
|
||||
static struct pipe_texture *
|
||||
i965_drm_texture_from_shared_handle(struct drm_api *api,
|
||||
struct pipe_screen *screen,
|
||||
struct pipe_texture *templ,
|
||||
const char* name,
|
||||
unsigned pitch,
|
||||
unsigned handle)
|
||||
{
|
||||
struct i965_drm_winsys *idws = i965_drm_winsys(i965_screen(screen)->iws);
|
||||
struct i965_buffer *buffer;
|
||||
|
||||
buffer = i965_drm_buffer_from_handle(idws, name, handle);
|
||||
if (!buffer)
|
||||
return NULL;
|
||||
|
||||
return i965_texture_blanket_i965(screen, templ, pitch, buffer);
|
||||
}
|
||||
|
||||
static boolean
|
||||
i965_drm_shared_handle_from_texture(struct drm_api *api,
|
||||
struct pipe_screen *screen,
|
||||
struct pipe_texture *texture,
|
||||
unsigned *pitch,
|
||||
unsigned *handle)
|
||||
{
|
||||
struct i965_drm_buffer *buf = NULL;
|
||||
struct i965_buffer *buffer = NULL;
|
||||
if (!i965_get_texture_buffer_i965(texture, &buffer, pitch))
|
||||
return FALSE;
|
||||
|
||||
buf = i965_drm_buffer(buffer);
|
||||
if (!buf->flinked) {
|
||||
if (drm_i965_bo_flink(buf->bo, &buf->flink))
|
||||
return FALSE;
|
||||
buf->flinked = TRUE;
|
||||
}
|
||||
|
||||
*handle = buf->flink;
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static boolean
|
||||
i965_drm_local_handle_from_texture(struct drm_api *api,
|
||||
struct pipe_screen *screen,
|
||||
struct pipe_texture *texture,
|
||||
unsigned *pitch,
|
||||
unsigned *handle)
|
||||
{
|
||||
struct i965_buffer *buffer = NULL;
|
||||
if (!i965_get_texture_buffer_i965(texture, &buffer, pitch))
|
||||
return FALSE;
|
||||
|
||||
*handle = i965_drm_buffer(buffer)->bo->handle;
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static void
|
||||
i965_drm_winsys_destroy(struct i965_winsys *iws)
|
||||
{
|
||||
struct i965_drm_winsys *idws = i965_drm_winsys(iws);
|
||||
|
||||
drm_i965_bufmgr_destroy(idws->pools.gem);
|
||||
|
||||
FREE(idws);
|
||||
}
|
||||
|
||||
static struct pipe_screen *
|
||||
i965_drm_create_screen(struct drm_api *api, int drmFD,
|
||||
struct drm_create_screen_arg *arg)
|
||||
{
|
||||
struct i965_drm_winsys *idws;
|
||||
unsigned int deviceID;
|
||||
|
||||
if (arg != NULL) {
|
||||
switch(arg->mode) {
|
||||
case DRM_CREATE_NORMAL:
|
||||
break;
|
||||
default:
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
idws = CALLOC_STRUCT(i965_drm_winsys);
|
||||
if (!idws)
|
||||
return NULL;
|
||||
|
||||
i965_drm_get_device_id(&deviceID);
|
||||
|
||||
i965_drm_winsys_init_batchbuffer_functions(idws);
|
||||
i965_drm_winsys_init_buffer_functions(idws);
|
||||
i965_drm_winsys_init_fence_functions(idws);
|
||||
|
||||
idws->fd = drmFD;
|
||||
idws->id = deviceID;
|
||||
idws->max_batch_size = 16 * 4096;
|
||||
|
||||
idws->base.destroy = i965_drm_winsys_destroy;
|
||||
|
||||
idws->pools.gem = drm_i965_bufmgr_gem_init(idws->fd, idws->max_batch_size);
|
||||
drm_i965_bufmgr_gem_enable_reuse(idws->pools.gem);
|
||||
|
||||
idws->softpipe = FALSE;
|
||||
idws->dump_cmd = debug_get_bool_option("I965_DUMP_CMD", FALSE);
|
||||
|
||||
return i965_create_screen(&idws->base, deviceID);
|
||||
}
|
||||
|
||||
static struct pipe_context *
|
||||
i965_drm_create_context(struct drm_api *api, struct pipe_screen *screen)
|
||||
{
|
||||
return i965_create_context(screen);
|
||||
}
|
||||
|
||||
static void
|
||||
destroy(struct drm_api *api)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
struct drm_api i965_drm_api =
|
||||
{
|
||||
.create_context = i965_drm_create_context,
|
||||
.create_screen = i965_drm_create_screen,
|
||||
.texture_from_shared_handle = i965_drm_texture_from_shared_handle,
|
||||
.shared_handle_from_texture = i965_drm_shared_handle_from_texture,
|
||||
.local_handle_from_texture = i965_drm_local_handle_from_texture,
|
||||
.destroy = destroy,
|
||||
};
|
||||
|
||||
struct drm_api *
|
||||
drm_api_create()
|
||||
{
|
||||
return trace_drm_create(&i965_drm_api);
|
||||
}
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
|
||||
#include "intel_drm_winsys.h"
|
||||
#include "i965_drm_winsys.h"
|
||||
#include "util/u_memory.h"
|
||||
|
||||
#include "i915_drm.h"
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
#ifndef INTEL_DRM_WINSYS_H
|
||||
#define INTEL_DRM_WINSYS_H
|
||||
|
||||
#include "i915/intel_batchbuffer.h"
|
||||
#include "i965/intel_batchbuffer.h"
|
||||
|
||||
#include "drm.h"
|
||||
#include "intel_bufmgr.h"
|
||||
@@ -1,209 +0,0 @@
|
||||
|
||||
#include "state_tracker/drm_api.h"
|
||||
|
||||
#include "intel_drm_winsys.h"
|
||||
#include "util/u_memory.h"
|
||||
|
||||
#include "i915/i915_context.h"
|
||||
#include "i915/i915_screen.h"
|
||||
|
||||
#include "trace/tr_drm.h"
|
||||
|
||||
/*
|
||||
* Helper functions
|
||||
*/
|
||||
|
||||
|
||||
static void
|
||||
intel_drm_get_device_id(unsigned int *device_id)
|
||||
{
|
||||
char path[512];
|
||||
FILE *file;
|
||||
void *shutup_gcc;
|
||||
|
||||
/*
|
||||
* FIXME: Fix this up to use a drm ioctl or whatever.
|
||||
*/
|
||||
|
||||
snprintf(path, sizeof(path), "/sys/class/drm/card0/device/device");
|
||||
file = fopen(path, "r");
|
||||
if (!file) {
|
||||
return;
|
||||
}
|
||||
|
||||
shutup_gcc = fgets(path, sizeof(path), file);
|
||||
sscanf(path, "%x", device_id);
|
||||
fclose(file);
|
||||
}
|
||||
|
||||
static struct intel_buffer *
|
||||
intel_drm_buffer_from_handle(struct intel_drm_winsys *idws,
|
||||
const char* name, unsigned handle)
|
||||
{
|
||||
struct intel_drm_buffer *buf = CALLOC_STRUCT(intel_drm_buffer);
|
||||
uint32_t tile = 0, swizzle = 0;
|
||||
|
||||
if (!buf)
|
||||
return NULL;
|
||||
|
||||
buf->magic = 0xDEAD1337;
|
||||
buf->bo = drm_intel_bo_gem_create_from_name(idws->pools.gem, name, handle);
|
||||
buf->flinked = TRUE;
|
||||
buf->flink = handle;
|
||||
|
||||
if (!buf->bo)
|
||||
goto err;
|
||||
|
||||
drm_intel_bo_get_tiling(buf->bo, &tile, &swizzle);
|
||||
if (tile != INTEL_TILE_NONE)
|
||||
buf->map_gtt = TRUE;
|
||||
|
||||
return (struct intel_buffer *)buf;
|
||||
|
||||
err:
|
||||
FREE(buf);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Exported functions
|
||||
*/
|
||||
|
||||
|
||||
static struct pipe_texture *
|
||||
intel_drm_texture_from_shared_handle(struct drm_api *api,
|
||||
struct pipe_screen *screen,
|
||||
struct pipe_texture *templ,
|
||||
const char* name,
|
||||
unsigned pitch,
|
||||
unsigned handle)
|
||||
{
|
||||
struct intel_drm_winsys *idws = intel_drm_winsys(i915_screen(screen)->iws);
|
||||
struct intel_buffer *buffer;
|
||||
|
||||
buffer = intel_drm_buffer_from_handle(idws, name, handle);
|
||||
if (!buffer)
|
||||
return NULL;
|
||||
|
||||
return i915_texture_blanket_intel(screen, templ, pitch, buffer);
|
||||
}
|
||||
|
||||
static boolean
|
||||
intel_drm_shared_handle_from_texture(struct drm_api *api,
|
||||
struct pipe_screen *screen,
|
||||
struct pipe_texture *texture,
|
||||
unsigned *pitch,
|
||||
unsigned *handle)
|
||||
{
|
||||
struct intel_drm_buffer *buf = NULL;
|
||||
struct intel_buffer *buffer = NULL;
|
||||
if (!i915_get_texture_buffer_intel(texture, &buffer, pitch))
|
||||
return FALSE;
|
||||
|
||||
buf = intel_drm_buffer(buffer);
|
||||
if (!buf->flinked) {
|
||||
if (drm_intel_bo_flink(buf->bo, &buf->flink))
|
||||
return FALSE;
|
||||
buf->flinked = TRUE;
|
||||
}
|
||||
|
||||
*handle = buf->flink;
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static boolean
|
||||
intel_drm_local_handle_from_texture(struct drm_api *api,
|
||||
struct pipe_screen *screen,
|
||||
struct pipe_texture *texture,
|
||||
unsigned *pitch,
|
||||
unsigned *handle)
|
||||
{
|
||||
struct intel_buffer *buffer = NULL;
|
||||
if (!i915_get_texture_buffer_intel(texture, &buffer, pitch))
|
||||
return FALSE;
|
||||
|
||||
*handle = intel_drm_buffer(buffer)->bo->handle;
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static void
|
||||
intel_drm_winsys_destroy(struct intel_winsys *iws)
|
||||
{
|
||||
struct intel_drm_winsys *idws = intel_drm_winsys(iws);
|
||||
|
||||
drm_intel_bufmgr_destroy(idws->pools.gem);
|
||||
|
||||
FREE(idws);
|
||||
}
|
||||
|
||||
static struct pipe_screen *
|
||||
intel_drm_create_screen(struct drm_api *api, int drmFD,
|
||||
struct drm_create_screen_arg *arg)
|
||||
{
|
||||
struct intel_drm_winsys *idws;
|
||||
unsigned int deviceID;
|
||||
|
||||
if (arg != NULL) {
|
||||
switch(arg->mode) {
|
||||
case DRM_CREATE_NORMAL:
|
||||
break;
|
||||
default:
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
idws = CALLOC_STRUCT(intel_drm_winsys);
|
||||
if (!idws)
|
||||
return NULL;
|
||||
|
||||
intel_drm_get_device_id(&deviceID);
|
||||
|
||||
intel_drm_winsys_init_batchbuffer_functions(idws);
|
||||
intel_drm_winsys_init_buffer_functions(idws);
|
||||
intel_drm_winsys_init_fence_functions(idws);
|
||||
|
||||
idws->fd = drmFD;
|
||||
idws->id = deviceID;
|
||||
idws->max_batch_size = 16 * 4096;
|
||||
|
||||
idws->base.destroy = intel_drm_winsys_destroy;
|
||||
|
||||
idws->pools.gem = drm_intel_bufmgr_gem_init(idws->fd, idws->max_batch_size);
|
||||
drm_intel_bufmgr_gem_enable_reuse(idws->pools.gem);
|
||||
|
||||
idws->softpipe = FALSE;
|
||||
idws->dump_cmd = debug_get_bool_option("INTEL_DUMP_CMD", FALSE);
|
||||
|
||||
return i915_create_screen(&idws->base, deviceID);
|
||||
}
|
||||
|
||||
static struct pipe_context *
|
||||
intel_drm_create_context(struct drm_api *api, struct pipe_screen *screen)
|
||||
{
|
||||
return i915_create_context(screen);
|
||||
}
|
||||
|
||||
static void
|
||||
destroy(struct drm_api *api)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
struct drm_api intel_drm_api =
|
||||
{
|
||||
.create_context = intel_drm_create_context,
|
||||
.create_screen = intel_drm_create_screen,
|
||||
.texture_from_shared_handle = intel_drm_texture_from_shared_handle,
|
||||
.shared_handle_from_texture = intel_drm_shared_handle_from_texture,
|
||||
.local_handle_from_texture = intel_drm_local_handle_from_texture,
|
||||
.destroy = destroy,
|
||||
};
|
||||
|
||||
struct drm_api *
|
||||
drm_api_create()
|
||||
{
|
||||
return trace_drm_create(&intel_drm_api);
|
||||
}
|
||||
@@ -17,8 +17,8 @@ INCLUDES = \
|
||||
|
||||
LIBS = \
|
||||
$(TOP)/src/gallium/state_trackers/xorg/libxorgtracker.a \
|
||||
$(TOP)/src/gallium/winsys/drm/intel/gem/libinteldrm.a \
|
||||
$(TOP)/src/gallium/drivers/i915/libi915.a \
|
||||
$(TOP)/src/gallium/winsys/drm/i965/gem/libi965drm.a \
|
||||
$(TOP)/src/gallium/drivers/i965/libi965.a \
|
||||
$(TOP)/src/gallium/drivers/trace/libtrace.a \
|
||||
$(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
|
||||
$(GALLIUM_AUXILIARIES)
|
||||
@@ -35,7 +35,7 @@ all default: $(TARGET)
|
||||
|
||||
$(TARGET): $(OBJECTS) Makefile $(TOP)/src/gallium/state_trackers/xorg/libxorgtracker.a $(LIBS)
|
||||
$(TOP)/bin/mklib -noprefix -o $@ \
|
||||
$(OBJECTS) $(LIBS) $(shell pkg-config --libs libdrm) -ldrm_intel
|
||||
$(OBJECTS) $(LIBS) $(shell pkg-config --libs libdrm) -ldrm_i965
|
||||
|
||||
clean:
|
||||
rm -rf $(OBJECTS) $(TARGET)
|
||||
|
||||
Reference in New Issue
Block a user