KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

st/dri: fold dri_extensions.c into dri_context.c

This commit is contained in:
George Sapountzis 2010-03-26 18:44:39 +02:00
parent 22cd6f2cb4
commit 4b722bf9fd
7 changed files with 13 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/gallium/state_trackers/dri/common/dri_context.c
View File

@ -29,13 +29,25 @@
* Author: Jakob Bornecrantz <wallbraker@gmail.com>
*/
#include "utils.h"
#include "dri_screen.h"
#include "dri_drawable.h"
#include "dri_context.h"
#include "dri_st_api.h"
#include "pipe/p_context.h"
#include "util/u_memory.h"
#include "state_tracker/st_context.h"
static void
dri_init_extensions(struct dri_context *ctx)
{
struct st_context *st = (struct st_context *) ctx->st;
/* New extensions should be added in mesa/state_tracker/st_extensions.c
* and not in this file. */
driInitExtensions(st->ctx, NULL, GL_FALSE);
}
GLboolean
dri_create_context(const __GLcontextModes * visual,

5
src/gallium/state_trackers/dri/common/dri_context.h
View File

@ -87,11 +87,6 @@ dri_create_context(const __GLcontextModes * visual,
__DRIcontext * driContextPriv,
void *sharedContextPrivate);
/***********************************************************************
* dri_extensions.c
*/
void dri_init_extensions(struct dri_context *ctx);
#endif
/* vim: set sw=3 ts=8 sts=3 expandtab: */

48
src/gallium/state_trackers/dri/common/dri_extensions.c
View File

@ -1,48 +0,0 @@
/**************************************************************************
*
* Copyright 2009, VMware, Inc.
* 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 VMWARE 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.
*
**************************************************************************/
/*
* Author: Keith Whitwell <keithw@vmware.com>
* Author: Jakob Bornecrantz <wallbraker@gmail.com>
*/
#include "dri_screen.h"
#include "dri_context.h"
#include "state_tracker/st_context.h"
#include "utils.h"
void
dri_init_extensions(struct dri_context *ctx)
{
struct st_context *st = (struct st_context *) ctx->st;
/* New extensions should be added in mesa/state_tracker/st_extensions.c
* and not in this file. */
driInitExtensions(st->ctx, NULL, GL_FALSE);
}
/* vim: set sw=3 ts=8 sts=3 expandtab: */

1
src/gallium/state_trackers/dri/drm/Makefile
View File

@ -16,7 +16,6 @@ C_SOURCES = \
dri_context.c \
dri_screen.c \
dri_drawable.c \
dri_extensions.c \
dri_st_api.c \
dri1_helper.c \
dri1.c \

1
src/gallium/state_trackers/dri/drm/dri_extensions.c
View File

@ -1 +0,0 @@
../common/dri_extensions.c

1
src/gallium/state_trackers/dri/sw/Makefile
View File

@ -19,7 +19,6 @@ C_SOURCES = \
dri_context.c \
dri_screen.c \
dri_drawable.c \
dri_extensions.c \
dri_st_api.c \
dri1_helper.c \
drisw.c

1
src/gallium/state_trackers/dri/sw/dri_extensions.c
View File

@ -1 +0,0 @@
../common/dri_extensions.c