fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-06-01 15:48:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r200/r300: get up to speed on renamed files

Browse source
This commit is contained in:
Dave Airlie 2009-02-12 22:48:18 +10:00
parent 23d3559bd4
commit 8cb16e6daf
15 changed files with 63 additions and 141 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/mesa/drivers/dri/r200/Makefile
View file

@ -11,6 +11,17 @@ ifeq ($(USING_EGL), 1)
EGL_SOURCES = server/radeon_egl.c
endif
RADEON_COMMON_SOURCES = \
radeon_texture.c \
radeon_common_context.c \
radeon_dma.c \
radeon_lock.c \
radeon_bo_legacy.c \
radeon_cs_legacy.c \
radeon_mipmap_tree.c \
radeon_span.c
DRIVER_SOURCES = r200_context.c \
r200_ioctl.c \
r200_state.c \
@ -26,13 +37,8 @@ DRIVER_SOURCES = r200_context.c \
r200_fragshader.c \
r200_vertprog.c \
radeon_screen.c \
common_lock.c \
common_misc.c \
radeon_bo_legacy.c \
radeon_cs_legacy.c \
radeon_mipmap_tree.c \
radeon_span.c \
$(EGL_SOURCES)
$(EGL_SOURCES) \
$(RADEON_COMMON_SOURCES)
C_SOURCES = $(COMMON_SOURCES) $(DRIVER_SOURCES)
@ -59,14 +65,19 @@ COMMON_SYMLINKS = \
radeon_span.h \
radeon_span.c \
radeon_buffer.h \
common_context.h \
common_lock.c \
common_lock.h \
common_misc.h \
common_misc.c \
common_cmdbuf.h \
radeon_lock.c \
radeon_lock.h \
radeon_common.c \
radeon_common_context.c \
radeon_common_context.h \
radeon_common.h \
radeon_cmdbuf.h \
radeon_mipmap_tree.c \
radeon_mipmap_tree.h
radeon_mipmap_tree.h \
radeon_texture.c \
radeon_texture.h \
radeon_dma.c \
radeon_dma.h
DRI_LIB_DEPS += -ldrm_radeon

3
src/mesa/drivers/dri/r200/r200_cmdbuf.c
View file

@ -38,9 +38,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "swrast/swrast.h"
#include "main/simple_list.h"
#include "radeon_cs.h"
#include "radeon_common.h"
#include "r200_context.h"
#include "common_cmdbuf.h"
#include "r200_state.h"
#include "r200_ioctl.h"
#include "r200_tcl.h"

7
src/mesa/drivers/dri/r200/r200_context.h
View file

@ -54,15 +54,14 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#endif
#include "radeon_screen.h"
#include "common_context.h"
#include "common_misc.h"
#include "radeon_common.h"
#include "radeon_lock.h"
struct r200_context;
typedef struct r200_context r200ContextRec;
typedef struct r200_context *r200ContextPtr;
#include "r200_lock.h"
#include "main/mm.h"
struct r200_vertex_program {

5
src/mesa/drivers/dri/r200/r200_ioctl.c
View file

@ -41,10 +41,9 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "main/context.h"
#include "swrast/swrast.h"
#include "radeon_cs.h"
#include "radeon_common.h"
#include "radeon_lock.h"
#include "r200_context.h"
#include "common_cmdbuf.h"
#include "r200_state.h"
#include "r200_ioctl.h"
#include "r200_tcl.h"

3
src/mesa/drivers/dri/r200/r200_ioctl.h
View file

@ -37,7 +37,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "main/simple_list.h"
#include "radeon_dri.h"
#include "r200_lock.h"
#include "radeon_cs_legacy.h"
@ -45,8 +44,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "drm.h"
#include "radeon_drm.h"
#include "common_cmdbuf.h"
extern void r200EmitVertexAOS( r200ContextPtr rmesa,
GLuint vertex_size,
struct radeon_bo *bo,

40
src/mesa/drivers/dri/r200/r200_lock.h
View file

@ -1,40 +0,0 @@
/*
Copyright (C) The Weather Channel, Inc. 2002. All Rights Reserved.
The Weather Channel (TM) funded Tungsten Graphics to develop the
initial release of the Radeon 8500 driver under the XFree86 license.
This notice must be preserved.
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, sublicense, 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 NONINFRINGEMENT.
IN NO EVENT SHALL THE COPYRIGHT OWNER(S) 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.
**************************************************************************/
/*
* Authors:
* Keith Whitwell <keith@tungstengraphics.com>
*/
#ifndef __R200_LOCK_H__
#define __R200_LOCK_H__
#include "common_lock.h"
#endif /* __R200_LOCK_H__ */

4
src/mesa/drivers/dri/r200/r200_state_init.c
View file

@ -43,10 +43,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "tnl/t_pipeline.h"
#include "swrast_setup/swrast_setup.h"
#include "radeon_buffer.h"
#include "radeon_common.h"
#include "radeon_mipmap_tree.h"
#include "radeon_cs.h"
#include "common_misc.h"
#include "r200_context.h"
#include "r200_ioctl.h"
#include "r200_state.h"

4
src/mesa/drivers/dri/r200/r200_texstate.c
View file

@ -40,7 +40,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "main/texobj.h"
#include "main/enums.h"
#include "common_context.h"
#include "radeon_common.h"
#include "radeon_mipmap_tree.h"
#include "r200_context.h"
#include "r200_state.h"
@ -1411,7 +1411,7 @@ static GLboolean r200_validate_texture(GLcontext *ctx, struct gl_texture_object
return GL_TRUE;
}
GLboolean r200UpdateTextureUnit(GLcontext *ctx, int unit)
static GLboolean r200UpdateTextureUnit(GLcontext *ctx, int unit)
{
r200ContextPtr rmesa = R200_CONTEXT(ctx);
GLuint unitneeded = rmesa->state.texture.unit[unit].unitneeded;

36
src/mesa/drivers/dri/r300/Makefile
View file

@ -20,13 +20,18 @@ COMMON_SOURCES = \
../common/xmlconfig.c \
../common/dri_util.c
RADEON_COMMON_SOURCES = \
radeon_texture.c \
radeon_common_context.c \
radeon_dma.c \
radeon_lock.c \
radeon_bo_legacy.c \
radeon_cs_legacy.c \
radeon_mipmap_tree.c \
radeon_span.c
DRIVER_SOURCES = \
radeon_bo_legacy.c \
radeon_cs_legacy.c \
radeon_screen.c \
common_lock.c \
common_misc.c \
radeon_span.c \
r300_ioctl.c \
r300_cmdbuf.c \
r300_state.c \
@ -46,7 +51,7 @@ DRIVER_SOURCES = \
r300_shader.c \
r300_emit.c \
r300_swtcl.c \
radeon_mipmap_tree.c \
$(RADEON_COMMON_SOURCES) \
$(EGL_SOURCES)
C_SOURCES = $(COMMON_SOURCES) $(DRIVER_SOURCES)
@ -75,14 +80,19 @@ COMMON_SYMLINKS = \
radeon_cs_legacy.c \
radeon_bo_legacy.h \
radeon_cs_legacy.h \
common_context.h \
common_lock.c \
common_lock.h \
common_misc.c \
common_misc.h \
common_cmdbuf.h \
radeon_lock.c \
radeon_lock.h \
radeon_common.c \
radeon_common.h \
radeon_common_context.c \
radeon_common_context.h \
radeon_cmdbuf.h \
radeon_dma.c \
radeon_dma.h \
radeon_mipmap_tree.c \
radeon_mipmap_tree.h
radeon_mipmap_tree.h \
radeon_texture.c \
radeon_texture.h
DRI_LIB_DEPS += -ldrm_radeon

4
src/mesa/drivers/dri/r300/r300_cmdbuf.h
View file

@ -39,10 +39,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "r300_context.h"
#include "radeon_cs.h"
#include "common_cmdbuf.h"
extern void r300EmitState(r300ContextPtr r300);
extern void r300InitCmdBuf(r300ContextPtr r300);
extern void r300DestroyCmdBuf(r300ContextPtr r300);

3
src/mesa/drivers/dri/r300/r300_context.h
View file

@ -42,8 +42,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "radeon_drm.h"
#include "dri_util.h"
#include "texmem.h"
#include "common_context.h"
#include "radeon_context.h"
#include "radeon_common.h"
#include "radeon_bo.h"
#include "main/macros.h"

3
src/mesa/drivers/dri/r300/r300_ioctl.c
View file

@ -46,7 +46,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "main/context.h"
#include "swrast/swrast.h"
#include "radeon_buffer.h"
#include "radeon_common.h"
#include "radeon_lock.h"
#include "r300_context.h"
#include "r300_ioctl.h"
#include "r300_cmdbuf.h"

3
src/mesa/drivers/dri/r300/r300_render.c
View file

@ -334,7 +334,6 @@ static void r300FireAOS(r300ContextPtr rmesa, int vertex_count, int type)
static void r300RunRenderPrimitive(r300ContextPtr rmesa, GLcontext * ctx,
int start, int end, int prim)
{
BATCH_LOCALS(&rmesa->radeon);
int type, num_verts;
TNLcontext *tnl = TNL_CONTEXT(ctx);
struct vertex_buffer *vb = &tnl->vb;
@ -396,7 +395,7 @@ static GLboolean r300RunRender(GLcontext * ctx,
r300UpdateShaderStates(rmesa);
r300EmitCacheFlush(rmesa);
r300EmitState(rmesa);
radeonEmitState(&rmesa->radeon);
for (i = 0; i < vb->PrimitiveCount; i++) {
GLuint prim = _tnl_translate_prim(&vb->Primitive[i]);

47
src/mesa/drivers/dri/r300/radeon_lock.h
View file

@ -1,47 +0,0 @@
/**************************************************************************
Copyright 2000, 2001 ATI Technologies Inc., Ontario, Canada, and
VA Linux Systems Inc., Fremont, California.
Copyright (C) The Weather Channel, Inc. 2002. All Rights Reserved.
The Weather Channel (TM) funded Tungsten Graphics to develop the
initial release of the Radeon 8500 driver under the XFree86 license.
This notice must be preserved.
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, sublicense, 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 NONINFRINGEMENT.
IN NO EVENT SHALL THE COPYRIGHT OWNER(S) 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.
**************************************************************************/
/*
* Authors:
* Gareth Hughes <gareth@valinux.com>
* Keith Whitwell <keith@tungstengraphics.com>
* Kevin E. Martin <martin@valinux.com>
*/
#ifndef __RADEON_LOCK_H__
#define __RADEON_LOCK_H__
#include "common_lock.h"
#endif /* __RADEON_LOCK_H__ */

1
src/mesa/drivers/dri/r300/radeon_lock.h Symbolic link
View file

@ -0,0 +1 @@
../radeon/radeon_lock.h

2
src/mesa/drivers/dri/r300/radeon_program_pair.c
View file

@ -35,7 +35,7 @@
#include "radeon_program_pair.h"
#include "radeon_context.h"
#include "radeon_common.h"
#include "shader/prog_print.h"