Commit 3b0ffd5a authored by Chia-I Wu's avatar Chia-I Wu

egl: Remove egl_softpipe.

With the addition egl_x11_swrast, egl_softpipe is sort of deprecated.
The new driver serves the same purpose as egl_softpipe does.  It is
based on egl_g3d and provides more features.
parent a1306f4e
......@@ -100,7 +100,7 @@ GALLIUM_DIRS = auxiliary drivers state_trackers
GALLIUM_AUXILIARIES = $(TOP)/src/gallium/auxiliary/libgallium.a
GALLIUM_DRIVERS_DIRS = softpipe failover svga i915 i965 r300 trace identity
GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVERS_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)
GALLIUM_WINSYS_DIRS = drm xlib egl_xlib
GALLIUM_WINSYS_DIRS = drm xlib
GALLIUM_WINSYS_DRM_DIRS = swrast
GALLIUM_STATE_TRACKERS_DIRS = glx
......
......@@ -18,13 +18,11 @@ EGL_DRIVERS_DIRS =
GALLIUM_DRIVERS_DIRS = softpipe
# build egl_softpipe.so
GALLIUM_WINSYS_DIRS = egl_xlib
# and libGLES*.so
# build libGLES*.so
GALLIUM_STATE_TRACKERS_DIRS = es
# build egl_i915.so
# build egl_x11_{swrast,i915}.so
GALLIUM_DRIVERS_DIRS += trace i915
GALLIUM_STATE_TRACKERS_DIRS += egl_g3d
GALLIUM_WINSYS_DIRS += drm
GALLIUM_WINSYS_DRM_DIRS = intel
GALLIUM_WINSYS_DRM_DIRS += intel swrast
......@@ -136,7 +136,6 @@ each directory.
<li><b>winsys</b> -
<ul>
<li><b>drm</b> -
<li><b>egl_xlib</b> -
<li><b>g3dvl</b> -
<li><b>gdi</b> -
<li><b>xlib</b> -
......
......@@ -61,7 +61,7 @@ library_suffix(void)
#elif defined(_EGL_PLATFORM_POSIX)
static const char DefaultDriverName[] = "egl_softpipe";
static const char DefaultDriverName[] = "egl_glx";
typedef void * lib_handle;
......
# src/gallium/winsys/egl_xlib/Makefile
# Build softpipe/xlib/EGL driver library/object: "egl_softpipe.so"
TOP = ../../../..
include $(TOP)/configs/current
DRIVER_NAME = egl_softpipe.so
INCLUDE_DIRS = \
-I$(TOP)/include \
-I$(TOP)/src/egl/main \
-I$(TOP)/src/mesa \
-I$(TOP)/src/mesa/main \
-I$(TOP)/src/gallium/include \
-I$(TOP)/src/gallium/drivers \
-I$(TOP)/src/gallium/auxiliary
WINSYS_SOURCES = \
egl_xlib.c \
sw_winsys.c
WINSYS_OBJECTS = $(WINSYS_SOURCES:.c=.o)
LIBS = \
$(GALLIUM_DRIVERS) \
$(GALLIUM_AUXILIARIES)
LIB_DEPS = $(EGL_LIB_DEPS) -lm -lX11
LOCAL_CFLAGS =
.c.o:
$(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $(LOCAL_CFLAGS) $< -o $@
.PHONY: library
default: depend library Makefile
library: $(TOP)/$(LIB_DIR)/$(DRIVER_NAME)
# Make the egl_softpipe.so library
$(TOP)/$(LIB_DIR)/$(DRIVER_NAME): $(WINSYS_OBJECTS) $(LIBS)
$(TOP)/bin/mklib -o $(DRIVER_NAME) \
-linker "$(CC)" \
-noprefix \
-install $(TOP)/$(LIB_DIR) \
$(MKLIB_OPTIONS) $(WINSYS_OBJECTS) \
-Wl,--whole-archive $(LIBS) -Wl,--no-whole-archive \
$(LIB_DEPS)
depend: $(WINSYS_SOURCES)
@ echo "running $(MKDEP)"
@ rm -f depend # workaround oops on gutsy?!?
@ touch depend
@ $(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDE_DIRS) $(WINSYS_SOURCES) \
> /dev/null 2>/dev/null
install: default
$(INSTALL) -d $(INSTALL_DIR)/$(LIB_DIR)
@if [ -e $(TOP)/$(LIB_DIR) ]; then \
$(MINSTALL) $(TOP)/$(LIB_DIR)/$(DRIVER_NAME) $(INSTALL_DIR)/$(LIB_DIR); \
fi
# Emacs tags
tags:
etags `find . -name \*.[ch]` $(TOP)/include/GL/*.h
clean:
-rm -f *.o *~ *.bak
include depend
This diff is collapsed.
/**************************************************************************
*
* Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.
* All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sub license, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice (including the
* next paragraph) shall be included in all copies or substantial portions
* of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
* IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
* ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
**************************************************************************/
/**
* Totally software-based winsys layer.
* Note that the one winsys function that we can't implement here
* is flush_frontbuffer().
* Whoever uses this code will have to provide that.
*
* Authors: Brian Paul
*/
#include "pipe/internal/p_winsys_screen.h"
#include "pipe/p_state.h"
#include "pipe/p_inlines.h"
#include "util/u_format.h"
#include "util/u_math.h"
#include "util/u_memory.h"
#include "sw_winsys.h"
/** Subclass of pipe_winsys */
struct sw_pipe_winsys
{
struct pipe_winsys Base;
/* no extra fields for now */
};
/** subclass of pipe_buffer */
struct sw_pipe_buffer
{
struct pipe_buffer Base;
boolean UserBuffer; /** Is this a user-space buffer? */
void *Data;
void *Mapped;
};
/** cast wrapper */
static INLINE struct sw_pipe_buffer *
sw_pipe_buffer(struct pipe_buffer *b)
{
return (struct sw_pipe_buffer *) b;
}
static const char *
get_name(struct pipe_winsys *pws)
{
return "software";
}
/** Create new pipe_buffer and allocate storage of given size */
static struct pipe_buffer *
buffer_create(struct pipe_winsys *pws,
unsigned alignment,
unsigned usage,
unsigned size)
{
struct sw_pipe_buffer *buffer = CALLOC_STRUCT(sw_pipe_buffer);
if (!buffer)
return NULL;
pipe_reference_init(&buffer->Base.reference, 1);
buffer->Base.alignment = alignment;
buffer->Base.usage = usage;
buffer->Base.size = size;
/* align to 16-byte multiple for Cell */
buffer->Data = align_malloc(size, MAX2(alignment, 16));
return &buffer->Base;
}
/**
* Create buffer which wraps user-space data.
*/
static struct pipe_buffer *
user_buffer_create(struct pipe_winsys *pws, void *ptr, unsigned bytes)
{
struct sw_pipe_buffer *buffer = CALLOC_STRUCT(sw_pipe_buffer);
if (!buffer)
return NULL;
pipe_reference_init(&buffer->Base.reference, 1);
buffer->Base.size = bytes;
buffer->UserBuffer = TRUE;
buffer->Data = ptr;
return &buffer->Base;
}
static void *
buffer_map(struct pipe_winsys *pws, struct pipe_buffer *buf, unsigned flags)
{
struct sw_pipe_buffer *buffer = sw_pipe_buffer(buf);
buffer->Mapped = buffer->Data;
return buffer->Mapped;
}
static void
buffer_unmap(struct pipe_winsys *pws, struct pipe_buffer *buf)
{
struct sw_pipe_buffer *buffer = sw_pipe_buffer(buf);
buffer->Mapped = NULL;
}
static void
buffer_destroy(struct pipe_buffer *buf)
{
struct sw_pipe_buffer *buffer = sw_pipe_buffer(buf);
if (buffer->Data && !buffer->UserBuffer) {
align_free(buffer->Data);
buffer->Data = NULL;
}
free(buffer);
}
static struct pipe_buffer *
surface_buffer_create(struct pipe_winsys *winsys,
unsigned width, unsigned height,
enum pipe_format format,
unsigned usage,
unsigned tex_usage,
unsigned *stride)
{
const unsigned alignment = 64;
unsigned nblocksy;
nblocksy = util_format_get_nblocksy(format, height);
*stride = align(util_format_get_stride(format, width), alignment);
return winsys->buffer_create(winsys, alignment,
usage,
*stride * nblocksy);
}
static void
fence_reference(struct pipe_winsys *sws, struct pipe_fence_handle **ptr,
struct pipe_fence_handle *fence)
{
/* no-op */
}
static int
fence_signalled(struct pipe_winsys *sws, struct pipe_fence_handle *fence,
unsigned flag)
{
/* no-op */
return 0;
}
static int
fence_finish(struct pipe_winsys *sws, struct pipe_fence_handle *fence,
unsigned flag)
{
/* no-op */
return 0;
}
/**
* Create/return a new pipe_winsys object.
*/
struct pipe_winsys *
create_sw_winsys(void)
{
struct sw_pipe_winsys *ws = CALLOC_STRUCT(sw_pipe_winsys);
if (!ws)
return NULL;
/* Fill in this struct with callbacks that pipe will need to
* communicate with the window system, buffer manager, etc.
*/
ws->Base.buffer_create = buffer_create;
ws->Base.user_buffer_create = user_buffer_create;
ws->Base.buffer_map = buffer_map;
ws->Base.buffer_unmap = buffer_unmap;
ws->Base.buffer_destroy = buffer_destroy;
ws->Base.surface_buffer_create = surface_buffer_create;
ws->Base.fence_reference = fence_reference;
ws->Base.fence_signalled = fence_signalled;
ws->Base.fence_finish = fence_finish;
ws->Base.flush_frontbuffer = NULL; /* not implemented here! */
ws->Base.get_name = get_name;
return &ws->Base;
}
/**************************************************************************
*
* Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.
* All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sub license, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice (including the
* next paragraph) shall be included in all copies or substantial portions
* of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
* IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
* ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
**************************************************************************/
#ifndef SW_WINSYS_H
#define SW_WINSYS_H
struct pipe_winsys;
extern struct pipe_winsys *
create_sw_winsys(void);
#endif /* SW_WINSYS_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment