Commit d4510e53 authored by George Sapountzis's avatar George Sapountzis

drop GLcore

parent 6c56e0e1
......@@ -48,15 +48,7 @@ install:
linux-directfb-install:
cd src/mesa/drivers/directfb && $(MAKE) install
# Xserver GLcore module
glcore:
cd src/mesa/drivers/xorg && $(MAKE)
glcore-install:
cd src/mesa/drivers/xorg && $(MAKE) install
.PHONY: default doxygen clean realclean install linux-directfb-install \
glcore glcore-install
.PHONY: default doxygen clean realclean install linux-directfb-install
# If there's no current configuration file
$(TOP)/configs/current:
......
......@@ -78,10 +78,6 @@ GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @GLW_MESA_DEPS@ \
$(EXTRA_LIB_PATH) @GLW_LIB_DEPS@
APP_LIB_DEPS = $(EXTRA_LIB_PATH) @APP_LIB_DEPS@
# GLcore dependencies
XORG_CFLAGS = @XORG_CFLAGS@
GLCORE_LIB_DEPS = $(EXTRA_LIB_PATH) @GLCORE_LIB_DEPS@
# DRI dependencies
DRI_LIB_DEPS = $(EXTRA_LIB_PATH) @DRI_LIB_DEPS@
LIBDRM_CFLAGS = @LIBDRM_CFLAGS@
......
......@@ -81,10 +81,6 @@ GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lXt -lX11
# Program dependencies - specific GL/glut libraries added in Makefiles
APP_LIB_DEPS = -lm
# GLcore dependencies
XORG_CFLAGS = `pkg-config --cflags xorg-server`
GLCORE_LIB_DEPS = -lm -lpthread
# Installation directories (for make install)
INSTALL_DIR = /usr/local
......
......@@ -34,7 +34,6 @@ LIBDRM_LIB = `pkg-config --libs libdrm`
DRI_LIB_DEPS = -L/usr/local/lib -lm -pthread -lexpat $(LIBDRM_LIB)
GL_LIB_DEPS = -L/usr/local/lib -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
-lm -pthread $(LIBDRM_LIB)
GLCORE_LIB_DEPS = -lm -pthread
GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/local/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm
GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/local/lib -lGL -lXt -lX11
......
......@@ -48,7 +48,6 @@ LIBDRM_LIB = `pkg-config --libs libdrm`
DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)
GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
-lm -lpthread -ldl $(LIBDRM_LIB)
GLCORE_LIB_DEPS = -lm -lpthread -ldl
# This is now 0 by default since it seems to confuse the hell out of people
......
......@@ -668,18 +668,6 @@ esac
AC_SUBST([OSMESA_LIB_DEPS])
AC_SUBST([OSMESA_MESA_DEPS])
dnl
dnl GLcore configuration
dnl
# delay pkg-config checks until `make glcore' run
XORG_CFLAGS='`pkg-config --cflags xorg-server`'
GLCORE_LIB_DEPS='-lm -lpthread'
if test "$mesa_driver" = dri; then
GLCORE_LIB_DEPS="$GLCORE_LIB_DEPS $DLOPEN_LIBS"
fi
AC_SUBST([XORG_CFLAGS])
AC_SUBST([GLCORE_LIB_DEPS])
dnl
dnl GLU configuration
dnl
......
......@@ -181,77 +181,4 @@ typedef struct __GLcontextModesRec {
#define GLX_TEXTURE_2D_BIT_EXT 0x00000002
#define GLX_TEXTURE_RECTANGLE_BIT_EXT 0x00000004
/************************************************************************/
#ifdef _NEED_GL_CORE_IF
/**
* The GLcore interface (a subset of the XMesa interface)
*/
#define __GL_CORE "GL_Core"
typedef struct __GLcoreModuleRec {
/*
* XMesaVisual
*/
XMesaVisual (*XMesaCreateVisual)( ScreenPtr display,
VisualPtr visinfo,
GLboolean rgb_flag,
GLboolean alpha_flag,
GLboolean db_flag,
GLboolean stereo_flag,
GLboolean ximage_flag,
GLint depth_size,
GLint stencil_size,
GLint accum_red_size,
GLint accum_green_size,
GLint accum_blue_size,
GLint accum_alpha_size,
GLint num_samples,
GLint level,
GLint visualCaveat );
void (*XMesaDestroyVisual)( XMesaVisual v );
/*
* XMesaBuffer
*/
XMesaBuffer (*XMesaCreateWindowBuffer)( XMesaVisual v,
WindowPtr w );
XMesaBuffer (*XMesaCreatePixmapBuffer)( XMesaVisual v,
PixmapPtr p,
ColormapPtr cmap );
void (*XMesaDestroyBuffer)( XMesaBuffer b );
void (*XMesaSwapBuffers)( XMesaBuffer b );
void (*XMesaResizeBuffers)( XMesaBuffer b );
/*
* XMesaContext
*/
XMesaContext (*XMesaCreateContext)( XMesaVisual v,
XMesaContext share_list );
void (*XMesaDestroyContext)( XMesaContext c );
GLboolean (*XMesaCopyContext)( XMesaContext src,
XMesaContext dst,
GLuint mask );
GLboolean (*XMesaMakeCurrent2)( XMesaContext c,
XMesaBuffer drawBuffer,
XMesaBuffer readBuffer );
GLboolean (*XMesaForceCurrent)( XMesaContext c );
GLboolean (*XMesaLoseCurrent)( XMesaContext c );
} __GLcoreModule;
#endif /* _NEED_GL_CORE_IF */
#endif /* __gl_core_h_ */
# 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 $(TOP)/$(LIB_DIR)/$(LIBNAME)
$(TOP)/$(LIB_DIR)/$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile
CC="$(CC)" CXX="$(CXX)" $(TOP)/bin/mklib -o $(LIBNAME) -noprefix \
-ldflags '$(LDFLAGS)' -install $(TOP)/$(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
/*
* 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;
}
# src/mesa/drivers/xorg/Makefile
TOP = ../../../..
include $(TOP)/configs/current
LIBNAME = libGLcore.so
SYMLINKS = \
glxheader.h \
xmesaP.h \
xm_api.c \
xm_buffer.c \
xm_dd.c \
xm_image.c \
xm_image.h \
xm_line.c \
xm_span.c \
xm_tri.c
C_SOURCES = \
xm_api.c \
xm_buffer.c \
xm_dd.c \
xm_image.c \
xm_line.c \
xm_span.c \
xm_tri.c \
glcore.c
########################################
MESA_MODULES = $(TOP)/src/mesa/libmesa.a
C_SOURCES += ../common/driverfuncs.c
ifeq ($(WINDOW_SYSTEM),dri)
C_SOURCES += ../dri/common/utils.c
endif
OBJECTS = $(C_SOURCES:.c=.o)
### Include directories
INCLUDES = \
-I. \
-I.. \
-I$(TOP)/include \
-I$(TOP)/src/mesa \
-I$(TOP)/src/mesa/main \
-I$(TOP)/src/mesa/glapi \
$(XORG_CFLAGS)
ifeq ($(WINDOW_SYSTEM),dri)
INCLUDES += \
-I$(TOP)/src/mesa/drivers/dri/common \
$(LIBDRM_CFLAGS)
endif
# undef 'USE_XSHM' to make it explicit that 'XFree86Server' takes precedence
DRIVER_DEFINES = -UUSE_XSHM -DXFree86Server
##### RULES #####
.c.o:
$(CC) -c $(INCLUDES) $(CFLAGS) $(DRIVER_DEFINES) $< -o $@
##### TARGETS #####
default: depend symlinks $(LIBNAME)
$(LIBNAME): $(OBJECTS) $(MESA_MODULES) Makefile
$(TOP)/bin/mklib -noprefix -o $@ \
$(OBJECTS) $(MESA_MODULES) $(GLCORE_LIB_DEPS)
depend: $(C_SOURCES) $(SYMLINKS)
touch depend
$(MKDEP) $(MKDEP_OPTIONS) $(DRIVER_DEFINES) $(INCLUDES) $(C_SOURCES) \
> /dev/null
clean:
-rm -f *.o *.so $(SYMLINKS)
-rm -f depend depend.bak
install: $(LIBNAME)
$(INSTALL) -d $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
$(INSTALL) -m 755 $(LIBNAME) $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
$(SYMLINKS):
@[ -e $@ ] || ln -sf ../x11/$@ ./
symlinks: $(SYMLINKS)
include depend
#define _NEED_GL_CORE_IF
#include <GL/xmesa.h>
#include <GL/internal/glcore.h>
#include "xmesaP.h"
PUBLIC
__GLcoreModule GL_Core = {
XMesaCreateVisual,
XMesaDestroyVisual,
XMesaCreateWindowBuffer,
XMesaCreatePixmapBuffer,
XMesaDestroyBuffer,
XMesaSwapBuffers,
XMesaResizeBuffers,
XMesaCreateContext,
XMesaDestroyContext,
XMesaCopyContext,
XMesaMakeCurrent2,
XMesaForceCurrent,
XMesaLoseCurrent
};
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