From f93a228c389685e16135e150d77e086df6547f9b Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Wed, 18 Jan 2006 00:22:21 +0000 Subject: Start a software-only DRI driver for use in the new accelerated indirect world. --- src/mesa/drivers/dri/glcore/Makefile | 83 ++++++++++++++++++ src/mesa/drivers/dri/glcore/glcore_driver.c | 128 ++++++++++++++++++++++++++++ 2 files changed, 211 insertions(+) create mode 100644 src/mesa/drivers/dri/glcore/Makefile create mode 100644 src/mesa/drivers/dri/glcore/glcore_driver.c diff --git a/src/mesa/drivers/dri/glcore/Makefile b/src/mesa/drivers/dri/glcore/Makefile new file mode 100644 index 0000000000..744b528c35 --- /dev/null +++ b/src/mesa/drivers/dri/glcore/Makefile @@ -0,0 +1,83 @@ +# src/mesa/drivers/dri/glcore/Makefile + +TOP = ../../../../.. +include $(TOP)/configs/current + +LIBNAME = glcore_dri.so + +DRIVER_SOURCES = glcore_driver.c \ + $(TOP)/src/mesa/drivers/common/driverfuncs.c \ + ../common/dri_util.c + +C_SOURCES = \ + $(DRIVER_SOURCES) \ + $(DRI_SOURCES) + + +# Include directories +INCLUDE_DIRS = \ + -I. \ + -I../common \ + -I../dri_client \ + -I../dri_client/imports \ + -Iserver \ + -I$(TOP)/include \ + -I$(DRM_SOURCE_PATH)/shared-core \ + -I$(TOP)/src/mesa \ + -I$(TOP)/src/mesa/main \ + -I$(TOP)/src/mesa/glapi \ + -I$(TOP)/src/mesa/math \ + -I$(TOP)/src/mesa/transform \ + -I$(TOP)/src/mesa/shader \ + -I$(TOP)/src/mesa/swrast \ + -I$(TOP)/src/mesa/swrast_setup + +# Core Mesa objects +MESA_MODULES = $(TOP)/src/mesa/libmesa.a + +# Libraries that the driver shared lib depends on +LIB_DEPS = -lm -lpthread -lc +# LIB_DEPS = -lGL -lm -lpthread -lc + + +ASM_SOURCES = + +OBJECTS = $(C_SOURCES:.c=.o) \ + $(ASM_SOURCES:.S=.o) + + +##### RULES ##### + +.c.o: + $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $(DEFINES) $< -o $@ + +.S.o: + $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $(DEFINES) $< -o $@ + + +##### TARGETS ##### + +default: depend $(LIB_DIR)/$(LIBNAME) + + +$(LIB_DIR)/$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile + CC="$(CC)" CXX="$(CXX)" $(TOP)/bin/mklib -o $(LIBNAME) -noprefix -install $(LIB_DIR) \ + $(OBJECTS) $(WINLIB) $(LIB_DEPS) $(WINOBJ) $(MESA_MODULES) + + +depend: $(C_SOURCES) $(ASM_SOURCES) + touch depend + $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDE_DIRS) $(C_SOURCES) $(ASM_SOURCES) \ + > /dev/null + + +# Emacs tags +tags: + etags `find . -name \*.[ch]` `find ../include` + + +clean: + -rm -f *.o server/*.o + + +include depend diff --git a/src/mesa/drivers/dri/glcore/glcore_driver.c b/src/mesa/drivers/dri/glcore/glcore_driver.c new file mode 100644 index 0000000000..2577816041 --- /dev/null +++ b/src/mesa/drivers/dri/glcore/glcore_driver.c @@ -0,0 +1,128 @@ +/* + * Copyright 2006 Red Hat, Inc. + * + * 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 + * on 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 + * THE AUTHORS 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. + */ + +/* + * This implements a software-only "DRI" driver. It doesn't actually speak + * any DRI protocol or talk to the DRM, it just looks enough like a DRI driver + * that libglx in the server can load it for software rendering in the + * unaccelerated case. + */ + +static GLboolean +glcoreInitDriver(__DRIscreenPrivate *driScreenPriv) +{ +} + +static void +glcoreDestroyScreen(__DRIScreenPrivate *driScreenPriv) +{ +} + +static GLboolean +glcoreCreateContext(const __GLcontextModes *glVisual, + __DRIcontextPrivate *driContextPriv, + void *shared_context) +{ +} + +static void +glcoreDestroyContext(__DRIcontextPrivate *driContextPriv) +{ +} + +static GLboolean +glcoreCreateBuffer(__DRIscreenPrivate *driScreenPriv, + __DRIdrawablePrivate *driDrawablePriv, + const __GLcontextModes *mesaVisual, + GLboolean isPixmap) +{ +} + +static void +glcoreDestroyBuffer(__DRIdrawablePrivate *driDrawablePriv) +{ +} + +static void +glcoreSwapBuffers(__DRIdrawablePrivate *driDrawablePriv) +{ +} + +static GLboolean +glcoreMakeCurrent(__DRIcontextPrivate *driContextPriv, + __DRIdrawablePrivate *driDrawablePriv, + __DRIdrawablePrivate *driReadablePriv) +{ +} + +static GLboolean +glcoreUnbindContext(__DRIcontextPrivate *driContextPriv) +{ +} + +static struct __DriverAPIRec glcore_api = { + .InitDriver = glcoreInitDriver, + .DestroyScreen = glcoreDestroyScreen, + .CreateContext = glcoreCreateContext, + .DestroyContext = glcoreDestroyContext, + .CreateBuffer = glcoreCreateBuffer, + .DestroyBuffer = glcoreDestroyBuffer, + .SwapBuffers = glcoreSwapBuffers, + .MakeCurrent = glcoreMakeCurrent, + .UnbindContext = glcoreUnbindContext, +}; + +static __GLcontextModes * +glcoreFillInModes(unsigned pixel_bits) +{ +} + +PUBLIC void * +__driCreateNewScreen_20050727(__DRInativeDisplay *dpy, int scrn, + __DRIscreen *psc, const __GLcontextModes *modes, + const __DRIversion *ddx_version, + const __DRIversion *dri_version, + const __DRIversion *drm_version, + const __DRIframebuffer *fb, drmAddress pSarea, + int fd, int internal_api_version, + const ___DRIinterfaceMethods *interface, + __GLcontextModes **driver_modes) +{ + __DRIscreenPrivate *driScreenPriv; + glcoreDriverPrivate *glcoreDriverPriv; + + /* would normally check ddx/dri/drm versions here */ + + driScreenPriv = __driUtilCreateNewScreen(dpy, scrn, psc, NULL, ddx_version, + dri_version, drm_version, fb, + internal_api_version, &glcore_api); + if (!driScreenPriv) + return NULL; + + glcoreDriverPriv = driScreenPriv->pDrvPriv; + + *driver_modes = glcoreFillInModes(glcoreDriverPriv->bpp); + + driInitExtensions(NULL, NULL, GL_FALSE); + + return driScreenPriv; +} -- cgit v1.2.3