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

Merge branch 'mesa_7_7_branch' 

Conflicts:

	src/mesa/drivers/dri/intel/intel_screen.c
	src/mesa/drivers/dri/intel/intel_swapbuffers.c
	src/mesa/drivers/dri/r300/r300_emit.c
	src/mesa/drivers/dri/r300/r300_ioctl.c
	src/mesa/drivers/dri/r300/r300_tex.c
	src/mesa/drivers/dri/r300/r300_texstate.c
This commit is contained in:
Brian Paul 2010-01-25 14:46:17 -07:00
parent 7e7f8815fb 6749310d3f
commit 9b22427911
97 changed files with 93 additions and 207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SConstruct
View File

@ -113,6 +113,8 @@ if platform in ('posix', 'linux', 'freebsd', 'darwin'):
'PTHREADS',
'HAVE_POSIX_MEMALIGN',
])
if platform == 'darwin':
env.Append(CPPDEFINES = ['_DARWIN_C_SOURCE'])
env.Append(CPPPATH = ['/usr/X11R6/include'])
env.Append(LIBPATH = ['/usr/X11R6/lib'])
env.Append(LIBS = [

7
progs/demos/Makefile
View File

@ -124,13 +124,6 @@ reflect.o: reflect.c showbuffer.h
$(APP_CC) -c -I$(INCDIR) $(CFLAGS) reflect.c
shadowtex: shadowtex.o showbuffer.o
$(APP_CC) $(CFLAGS) $(LDFLAGS) shadowtex.o showbuffer.o $(LIBS) -o $@
shadowtex.o: shadowtex.c showbuffer.h
$(APP_CC) -c -I$(INCDIR) $(CFLAGS) shadowtex.c
gloss: gloss.o trackball.o readtex.o
$(APP_CC) $(CFLAGS) $(LDFLAGS) gloss.o trackball.o readtex.o $(LIBS) -o $@

1
progs/demos/shadowtex.c
View File

@ -38,7 +38,6 @@
#include <math.h>
#include <GL/glew.h>
#include <GL/glut.h>
#include "showbuffer.h"
#define DEG_TO_RAD (3.14159 / 180.0)

5
scons/gallium.py
View File

@ -377,7 +377,10 @@ def generate(env):
'-Wl,-Bsymbolic',
]
# Handle circular dependencies in the libraries
env['_LIBFLAGS'] = '-Wl,--start-group ' + env['_LIBFLAGS'] + ' -Wl,--end-group'
if env['platform'] in ('darwin'):
pass
else:
env['_LIBFLAGS'] = '-Wl,--start-group ' + env['_LIBFLAGS'] + ' -Wl,--end-group'
if msvc:
if not env['debug']:
# enable Link-time Code Generation

2
src/gallium/auxiliary/util/u_tile.c
View File

@ -390,7 +390,7 @@ a4r4g4b4_put_tile_rgba(ushort *dst,
g >>= 4;
b >>= 4;
a >>= 4;
*dst++ = (a << 12) | (r << 16) | (g << 4) | b;
*dst++ = (a << 12) | (r << 8) | (g << 4) | b;
}
p += src_stride;
}

4
src/gallium/state_trackers/vega/shader.c
View File

@ -135,8 +135,8 @@ static VGint blend_bind_samplers(struct vg_context *ctx,
textures[2] = stfb->blend_texture;
if (!samplers[0] || !textures[0]) {
samplers[1] = samplers[2];
textures[1] = textures[2];
samplers[0] = samplers[2];
textures[0] = textures[2];
}
if (!samplers[1] || !textures[1]) {
samplers[1] = samplers[0];

2
src/gallium/state_trackers/xorg/xorg_dri2.c
View File

@ -376,6 +376,7 @@ xorg_dri2_init(ScreenPtr pScreen)
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
modesettingPtr ms = modesettingPTR(pScrn);
DRI2InfoRec dri2info;
#if DRI2INFOREC_VERSION >= 2
int major, minor;
if (xf86LoaderCheckSymbol("DRI2Version")) {
@ -385,6 +386,7 @@ xorg_dri2_init(ScreenPtr pScreen)
major = 1;
minor = 0;
}
#endif
dri2info.version = DRI2INFOREC_VERSION;
dri2info.fd = ms->fd;

56
src/gallium/state_trackers/xorg/xorg_driver.c
View File

@ -78,11 +78,13 @@ typedef enum
{
OPTION_SW_CURSOR,
OPTION_2D_ACCEL,
OPTION_DEBUG_FALLBACK,
} drv_option_enums;
static const OptionInfoRec drv_options[] = {
{OPTION_SW_CURSOR, "SWcursor", OPTV_BOOLEAN, {0}, FALSE},
{OPTION_2D_ACCEL, "2DAccel", OPTV_BOOLEAN, {0}, FALSE},
{OPTION_DEBUG_FALLBACK, "DebugFallback", OPTV_BOOLEAN, {0}, FALSE},
{-1, NULL, OPTV_NONE, {0}, FALSE}
};
@ -110,6 +112,28 @@ xorg_tracker_set_functions(ScrnInfoPtr scrn)
scrn->ValidMode = drv_valid_mode;
}
Bool
xorg_tracker_have_modesetting(ScrnInfoPtr pScrn, struct pci_device *device)
{
char *BusID = xalloc(64);
sprintf(BusID, "pci:%04x:%02x:%02x.%d",
device->domain, device->bus,
device->dev, device->func);
if (drmCheckModesettingSupported(BusID)) {
xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 0,
"Drm modesetting not supported %s\n", BusID);
xfree(BusID);
return FALSE;
}
xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 0,
"Drm modesetting supported on %s\n", BusID);
xfree(BusID);
return TRUE;
}
/*
* Internal function definitions
@ -648,10 +672,11 @@ drv_screen_init(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
xf86SetBlackWhitePixels(pScreen);
ms->accelerate_2d = xf86ReturnOptValBool(ms->Options, OPTION_2D_ACCEL, FALSE);
ms->debug_fallback = xf86ReturnOptValBool(ms->Options, OPTION_DEBUG_FALLBACK, TRUE);
if (ms->screen) {
ms->exa = xorg_exa_init(pScrn, xf86ReturnOptValBool(ms->Options,
OPTION_2D_ACCEL, TRUE));
ms->debug_fallback = debug_get_bool_option("XORG_DEBUG_FALLBACK", TRUE);
ms->exa = xorg_exa_init(pScrn, ms->accelerate_2d);
xorg_xv_init(pScreen);
#ifdef DRI2
@ -659,6 +684,17 @@ drv_screen_init(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
#endif
}
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "2D Acceleration is %s\n",
ms->screen && ms->accelerate_2d ? "enabled" : "disabled");
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Fallback debugging is %s\n",
ms->debug_fallback ? "enabled" : "disabled");
#ifdef DRI2
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "3D Acceleration is %s\n",
ms->screen ? "enabled" : "disabled");
#else
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "3D Acceleration is disabled\n");
#endif
miInitializeBackingStore(pScreen);
xf86SetBackingStore(pScreen);
xf86SetSilkenMouse(pScreen);
@ -1030,12 +1066,22 @@ drv_bind_front_buffer_kms(ScrnInfoPtr pScrn)
goto err_destroy;
pScreen->ModifyPixmapHeader(rootPixmap,
pScreen->width,
pScreen->height,
pScrn->virtualX,
pScrn->virtualY,
pScreen->rootDepth,
pScrn->bitsPerPixel,
stride,
ptr);
/* This a hack to work around EnableDisableFBAccess setting the pointer
* the real fix would be to replace pScrn->EnableDisableFBAccess hook
* and set the rootPixmap->devPrivate.ptr to something valid before that.
*
* But in its infinit visdome something uses either this some times before
* that, so our hook doesn't get called before the crash happens.
*/
pScrn->pixmapPrivate.ptr = ptr;
return TRUE;
err_destroy:

1
src/gallium/state_trackers/xorg/xorg_tracker.h
View File

@ -112,6 +112,7 @@ typedef struct _modesettingRec
/* exa */
struct exa_context *exa;
Bool noEvict;
Bool accelerate_2d;
Bool debug_fallback;
/* winsys hocks */

1
src/gallium/state_trackers/xorg/xorg_winsys.h
View File

@ -45,5 +45,6 @@
void xorg_tracker_set_functions(ScrnInfoPtr scrn);
const OptionInfoRec * xorg_tracker_available_options(int chipid, int busid);
Bool xorg_tracker_have_modesetting(ScrnInfoPtr pScrn, struct pci_device *device);
#endif

3
src/gallium/winsys/drm/vmware/xorg/vmw_video.c
View File

@ -649,7 +649,8 @@ vmw_video_port_play(ScrnInfoPtr pScrn, struct vmw_video_port *port,
return XvBadAlloc;
}
port->currBuf = ++port->currBuf & (VMWARE_VID_NUM_BUFFERS - 1);
if (++(port->currBuf) >= VMWARE_VID_NUM_BUFFERS)
port->currBuf = 0;
return Success;
}

10
src/gallium/winsys/drm/vmware/xorg/vmw_xorg.c
View File

@ -34,10 +34,10 @@
#include "vmw_hook.h"
static void vmw_xorg_identify(int flags);
static Bool vmw_xorg_pci_probe(DriverPtr driver,
int entity_num,
struct pci_device *device,
intptr_t match_data);
_X_EXPORT Bool vmw_xorg_pci_probe(DriverPtr driver,
int entity_num,
struct pci_device *device,
intptr_t match_data);
static const struct pci_id_match vmw_xorg_device_match[] = {
{0x15ad, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, 0, 0, 0},
@ -126,7 +126,7 @@ vmw_xorg_identify(int flags)
vmw_xorg_chipsets);
}
static Bool
_X_EXPORT Bool
vmw_xorg_pci_probe(DriverPtr driver,
int entity_num, struct pci_device *device, intptr_t match_data)
{

3
src/mesa/drivers/dri/i915/i830_context.c
View File

@ -28,14 +28,11 @@
#include "i830_context.h"
#include "main/imports.h"
#include "texmem.h"
#include "intel_tex.h"
#include "tnl/tnl.h"
#include "tnl/t_vertex.h"
#include "tnl/t_context.h"
#include "tnl/t_pipeline.h"
#include "utils.h"
#include "intel_span.h"
#include "intel_pixel.h"
#include "intel_tris.h"
/***************************************

5
src/mesa/drivers/dri/i915/i915_context.c
View File

@ -28,7 +28,6 @@
#include "i915_context.h"
#include "main/imports.h"
#include "main/macros.h"
#include "intel_tex.h"
#include "intel_tris.h"
#include "tnl/t_context.h"
#include "tnl/t_pipeline.h"
@ -38,15 +37,11 @@
#include "swrast_setup/swrast_setup.h"
#include "tnl/tnl.h"
#include "utils.h"
#include "i915_reg.h"
#include "i915_program.h"
#include "intel_regions.h"
#include "intel_batchbuffer.h"
#include "intel_tris.h"
#include "intel_span.h"
#include "intel_pixel.h"
/***************************************
* Mesa's Driver Functions

3
src/mesa/drivers/dri/i915/i915_debug_fp.c
View File

@ -30,9 +30,6 @@
#include "i915_reg.h"
#include "i915_debug.h"
#include "main/imports.h"
#include "shader/program.h"
#include "shader/prog_instruction.h"
#include "shader/prog_print.h"
#define PRINTF( ... ) _mesa_printf( __VA_ARGS__ )

1
src/mesa/drivers/dri/i915/i915_vtbl.c
View File

@ -37,7 +37,6 @@
#include "tnl/t_vertex.h"
#include "intel_batchbuffer.h"
#include "intel_tex.h"
#include "intel_regions.h"
#include "intel_tris.h"
#include "intel_fbo.h"

1
src/mesa/drivers/dri/i915/intel_tris.c
View File

@ -52,7 +52,6 @@
#include "intel_buffers.h"
#include "intel_reg.h"
#include "intel_span.h"
#include "intel_tex.h"
#include "intel_chipset.h"
#include "i830_context.h"
#include "i830_reg.h"

2
src/mesa/drivers/dri/i965/brw_cc.c
View File

@ -34,9 +34,7 @@
#include "brw_state.h"
#include "brw_defines.h"
#include "brw_util.h"
#include "intel_fbo.h"
#include "main/macros.h"
#include "main/enums.h"
static void prepare_cc_vp( struct brw_context *brw )
{

1
src/mesa/drivers/dri/i965/brw_clip_line.c
View File

@ -39,7 +39,6 @@
#include "brw_defines.h"
#include "brw_context.h"
#include "brw_eu.h"
#include "brw_util.h"
#include "brw_clip.h"

1
src/mesa/drivers/dri/i965/brw_clip_point.c
View File

@ -39,7 +39,6 @@
#include "brw_defines.h"
#include "brw_context.h"
#include "brw_eu.h"
#include "brw_util.h"
#include "brw_clip.h"

1
src/mesa/drivers/dri/i965/brw_clip_state.c
View File

@ -32,7 +32,6 @@
#include "brw_context.h"
#include "brw_state.h"
#include "brw_defines.h"
#include "main/macros.h"
struct brw_clip_unit_key {
unsigned int total_grf;

1
src/mesa/drivers/dri/i965/brw_clip_tri.c
View File

@ -39,7 +39,6 @@
#include "brw_defines.h"
#include "brw_context.h"
#include "brw_eu.h"
#include "brw_util.h"
#include "brw_clip.h"
static void release_tmps( struct brw_clip_compile *c )

1
src/mesa/drivers/dri/i965/brw_clip_unfilled.c
View File

@ -39,7 +39,6 @@
#include "brw_defines.h"
#include "brw_context.h"
#include "brw_eu.h"
#include "brw_util.h"
#include "brw_clip.h"

1
src/mesa/drivers/dri/i965/brw_clip_util.c
View File

@ -40,7 +40,6 @@
#include "brw_defines.h"
#include "brw_context.h"
#include "brw_eu.h"
#include "brw_util.h"
#include "brw_clip.h"

9
src/mesa/drivers/dri/i965/brw_context.c
View File

@ -33,24 +33,15 @@
#include "main/imports.h"
#include "main/api_noop.h"
#include "main/macros.h"
#include "main/vtxfmt.h"
#include "main/simple_list.h"
#include "shader/shader_api.h"
#include "brw_context.h"
#include "brw_defines.h"
#include "brw_draw.h"
#include "brw_state.h"
#include "brw_vs.h"
#include "intel_tex.h"
#include "intel_blit.h"
#include "intel_batchbuffer.h"
#include "intel_pixel.h"
#include "intel_span.h"
#include "tnl/t_pipeline.h"
#include "utils.h"
/***************************************
* Mesa's Driver Functions

2
src/mesa/drivers/dri/i965/brw_draw.c
View File

@ -39,10 +39,8 @@
#include "brw_defines.h"
#include "brw_context.h"
#include "brw_state.h"
#include "brw_fallback.h"
#include "intel_batchbuffer.h"
#include "intel_buffer_objects.h"
#define FILE_DEBUG_FLAG DEBUG_BATCH

4
src/mesa/drivers/dri/i965/brw_draw_upload.c
View File

@ -29,19 +29,15 @@
#include "main/glheader.h"
#include "main/bufferobj.h"
#include "main/context.h"
#include "main/state.h"
#include "main/api_validate.h"
#include "main/enums.h"
#include "brw_draw.h"
#include "brw_defines.h"
#include "brw_context.h"
#include "brw_state.h"
#include "brw_fallback.h"
#include "intel_batchbuffer.h"
#include "intel_buffer_objects.h"
#include "intel_tex.h"
static GLuint double_types[5] = {
0,

1
src/mesa/drivers/dri/i965/brw_fallback.c
View File

@ -36,7 +36,6 @@
#include "swrast/swrast.h"
#include "tnl/tnl.h"
#include "brw_context.h"
#include "brw_fallback.h"
#include "intel_chipset.h"
#include "intel_fbo.h"
#include "intel_regions.h"

1
src/mesa/drivers/dri/i965/brw_gs_emit.c
View File

@ -40,7 +40,6 @@
#include "brw_defines.h"
#include "brw_context.h"
#include "brw_eu.h"
#include "brw_util.h"
#include "brw_gs.h"
static void brw_gs_alloc_regs( struct brw_gs_compile *c,

1
src/mesa/drivers/dri/i965/brw_gs_state.c
View File

@ -34,7 +34,6 @@
#include "brw_context.h"
#include "brw_state.h"
#include "brw_defines.h"
#include "main/macros.h"
struct brw_gs_unit_key {
unsigned int total_grf;

1
src/mesa/drivers/dri/i965/brw_program.c
View File

@ -37,7 +37,6 @@
#include "tnl/tnl.h"
#include "brw_context.h"
#include "brw_util.h"
#include "brw_wm.h"
static void brwBindProgram( GLcontext *ctx,

1
src/mesa/drivers/dri/i965/brw_sf_state.c
View File

@ -35,7 +35,6 @@
#include "brw_state.h"
#include "brw_defines.h"
#include "main/macros.h"
#include "intel_fbo.h"
static void upload_sf_vp(struct brw_context *brw)
{

1
src/mesa/drivers/dri/i965/brw_vs_surface_state.c
View File

@ -35,7 +35,6 @@
#include "brw_context.h"
#include "brw_state.h"
#include "brw_defines.h"
/* Creates a new VS constant buffer reflecting the current VS program's
* constants, if needed by the VS program.

1
src/mesa/drivers/dri/i965/brw_vtbl.c
View File

@ -44,7 +44,6 @@
#include "brw_state.h"
#include "brw_draw.h"
#include "brw_state.h"
#include "brw_fallback.h"
#include "brw_vs.h"
#include "brw_wm.h"

1
src/mesa/drivers/dri/i965/brw_wm.c
View File

@ -30,7 +30,6 @@
*/
#include "brw_context.h"
#include "brw_util.h"
#include "brw_wm.h"
#include "brw_state.h"

1
src/mesa/drivers/dri/intel/intel_blit.c
View File

@ -38,7 +38,6 @@
#include "intel_reg.h"
#include "intel_regions.h"
#include "intel_batchbuffer.h"
#include "intel_chipset.h"
#define FILE_DEBUG_FLAG DEBUG_BLIT

2
src/mesa/drivers/dri/intel/intel_buffers.c
View File

@ -28,10 +28,8 @@
#include "intel_context.h"
#include "intel_buffers.h"
#include "intel_fbo.h"
#include "intel_regions.h"
#include "intel_batchbuffer.h"
#include "main/framebuffer.h"
#include "drirenderbuffer.h"
/**

3
src/mesa/drivers/dri/intel/intel_clear.c
View File

@ -33,12 +33,9 @@
#include "intel_context.h"
#include "intel_blit.h"
#include "intel_chipset.h"
#include "intel_clear.h"
#include "intel_fbo.h"
#include "intel_pixel.h"
#include "intel_regions.h"
#include "intel_batchbuffer.h"
#define FILE_DEBUG_FLAG DEBUG_BLIT

1
src/mesa/drivers/dri/intel/intel_context.c
View File

@ -28,7 +28,6 @@
#include "main/glheader.h"
#include "main/context.h"
#include "main/arrayobj.h"
#include "main/extensions.h"
#include "main/framebuffer.h"
#include "main/imports.h"

7
src/mesa/drivers/dri/intel/intel_pixel.c
View File

@ -29,14 +29,7 @@
#include "main/state.h"
#include "main/bufferobj.h"
#include "main/context.h"
#include "main/enable.h"
#include "main/matrix.h"
#include "main/texstate.h"
#include "main/varray.h"
#include "main/viewport.h"
#include "swrast/swrast.h"
#include "shader/arbprogram.h"
#include "shader/program.h"
#include "intel_context.h"
#include "intel_pixel.h"

2
src/mesa/drivers/dri/intel/intel_pixel_bitmap.c
View File

@ -37,7 +37,6 @@
#include "main/polygon.h"
#include "main/state.h"
#include "main/teximage.h"
#include "main/texenv.h"
#include "main/texobj.h"
#include "main/texstate.h"
#include "main/texparam.h"
@ -53,7 +52,6 @@
#include "intel_batchbuffer.h"
#include "intel_blit.h"
#include "intel_regions.h"
#include "intel_buffer_objects.h"
#include "intel_buffers.h"
#include "intel_pixel.h"
#include "intel_reg.h"

3
src/mesa/drivers/dri/intel/intel_pixel_draw.c
View File

@ -46,10 +46,7 @@
#include "drivers/common/meta.h"
#include "intel_context.h"
#include "intel_batchbuffer.h"
#include "intel_blit.h"
#include "intel_buffers.h"
#include "intel_regions.h"
#include "intel_pixel.h"
#include "intel_fbo.h"

1
src/mesa/drivers/dri/intel/intel_pixel_read.c
View File

@ -36,7 +36,6 @@
#include "intel_screen.h"
#include "intel_context.h"
#include "intel_batchbuffer.h"
#include "intel_blit.h"
#include "intel_buffers.h"
#include "intel_regions.h"

1
src/mesa/drivers/dri/intel/intel_regions.c
View File

@ -48,7 +48,6 @@
#include "intel_buffer_objects.h"
#include "intel_bufmgr.h"
#include "intel_batchbuffer.h"
#include "intel_chipset.h"
#define FILE_DEBUG_FLAG DEBUG_REGION

2
src/mesa/drivers/dri/intel/intel_screen.c
View File

@ -37,11 +37,9 @@
#include "intel_buffers.h"
#include "intel_bufmgr.h"
#include "intel_chipset.h"
#include "intel_extensions.h"
#include "intel_fbo.h"
#include "intel_regions.h"
#include "intel_screen.h"
#include "intel_span.h"
#include "intel_tex.h"
#include "i915_drm.h"

2
src/mesa/drivers/dri/intel/intel_state.c
View File

@ -35,8 +35,6 @@
#include "intel_screen.h"
#include "intel_context.h"
#include "intel_regions.h"
#include "swrast/swrast.h"
int
intel_translate_shadow_compare_func(GLenum func)

1
src/mesa/drivers/dri/intel/intel_tex_copy.c
View File

@ -36,7 +36,6 @@
#include "intel_screen.h"
#include "intel_context.h"
#include "intel_batchbuffer.h"
#include "intel_buffers.h"
#include "intel_mipmap_tree.h"
#include "intel_regions.h"

1
src/mesa/drivers/dri/intel/intel_tex_image.c
View File

@ -7,7 +7,6 @@
#include "main/convolve.h"
#include "main/context.h"
#include "main/formats.h"
#include "main/image.h"
#include "main/texcompress.h"
#include "main/texstore.h"
#include "main/texgetimage.h"

2
src/mesa/drivers/dri/intel/intel_tex_validate.c
View File

@ -2,10 +2,8 @@
#include "main/macros.h"
#include "intel_context.h"
#include "intel_batchbuffer.h"
#include "intel_mipmap_tree.h"
#include "intel_tex.h"
#include "intel_chipset.h"
#define FILE_DEBUG_FLAG DEBUG_TEXTURE

2
src/mesa/drivers/dri/mga/mga_xmesa.c
View File

@ -35,7 +35,6 @@
#include "mga_drm.h"
#include "mga_xmesa.h"
#include "main/context.h"
#include "main/matrix.h"
#include "main/simple_list.h"
#include "main/imports.h"
#include "main/framebuffer.h"
@ -64,7 +63,6 @@
#include "utils.h"
#include "vblank.h"
#include "main/extensions.h"
#include "drirenderbuffer.h"
#include "GL/internal/dri_interface.h"

5
src/mesa/drivers/dri/mga/mgadd.c
View File

@ -32,11 +32,6 @@
#include "mgacontext.h"
#include "mgadd.h"
#include "mgastate.h"
#include "mgaspan.h"
#include "mgatex.h"
#include "mgatris.h"
#include "mgavb.h"
#include "mga_xmesa.h"
#include "utils.h"

3
src/mesa/drivers/dri/mga/mgaioctl.c
View File

@ -42,10 +42,7 @@
#include "mgacontext.h"
#include "mgadd.h"
#include "mgastate.h"
#include "mgatex.h"
#include "mgavb.h"
#include "mgaioctl.h"
#include "mgatris.h"
#include "vblank.h"

1
src/mesa/drivers/dri/mga/mgarender.c
View File

@ -48,7 +48,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "mgacontext.h"
#include "mgatris.h"
#include "mgastate.h"
#include "mgaioctl.h"
#include "mgavb.h"

3
src/mesa/drivers/dri/mga/mgatex.c
View File

@ -40,11 +40,8 @@
#include "mgacontext.h"
#include "mgatex.h"
#include "mgaregs.h"
#include "mgatris.h"
#include "mgaioctl.h"
#include "swrast/swrast.h"
#include "xmlpool.h"
/**

1
src/mesa/drivers/dri/mga/mgatris.c
View File

@ -38,7 +38,6 @@
#include "mgaioctl.h"
#include "mgatris.h"
#include "mgavb.h"
#include "mgastate.h"
static void mgaRenderPrimitive( GLcontext *ctx, GLenum prim );

1
src/mesa/drivers/dri/mga/mgavb.c
View File

@ -39,7 +39,6 @@
#include "main/colormac.h"
#include "tnl/t_context.h"
#include "swrast_setup/swrast_setup.h"
#include "swrast/swrast.h"

2
src/mesa/drivers/dri/r200/r200_vertprog.c
View File

@ -437,7 +437,7 @@ static GLboolean r200_translate_vertex_program(GLcontext *ctx, struct r200_verte
(1 << VERT_RESULT_TEX2) | (1 << VERT_RESULT_TEX3) | (1 << VERT_RESULT_TEX4) |
(1 << VERT_RESULT_TEX5) | (1 << VERT_RESULT_PSIZ))) != 0) {
if (R200_DEBUG & RADEON_FALLBACKS) {
fprintf(stderr, "can't handle vert prog outputs 0x%x\n",
fprintf(stderr, "can't handle vert prog outputs 0x%llx\n",
mesa_vp->Base.OutputsWritten);
}
return GL_FALSE;

2
src/mesa/drivers/dri/r300/r300_cmdbuf.c
View File

@ -39,7 +39,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "main/macros.h"
#include "main/context.h"
#include "main/simple_list.h"
#include "swrast/swrast.h"
#include "drm.h"
#include "radeon_drm.h"
@ -50,7 +49,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "r300_emit.h"
#include "radeon_bocs_wrapper.h"
#include "radeon_mipmap_tree.h"
#include "r300_state.h"
#include "radeon_queryobj.h"
/** # of dwords reserved for additional instructions that may need to be written

5
src/mesa/drivers/dri/r300/r300_context.c
View File

@ -40,9 +40,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "main/context.h"
#include "main/simple_list.h"
#include "main/imports.h"
#include "main/matrix.h"
#include "main/extensions.h"
#include "main/state.h"
#include "main/bufferobj.h"
#include "main/texobj.h"
@ -52,13 +50,11 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "tnl/tnl.h"
#include "tnl/t_pipeline.h"
#include "tnl/t_vp_build.h"
#include "drivers/common/driverfuncs.h"
#include "drivers/common/meta.h"
#include "r300_context.h"
#include "radeon_context.h"
#include "radeon_span.h"
#include "r300_blit.h"
#include "r300_cmdbuf.h"
@ -70,7 +66,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "radeon_buffer_objects.h"
#include "radeon_queryobj.h"
#include "vblank.h"
#include "utils.h"
#include "xmlpool.h" /* for symbolic values of enum-type options */

3
src/mesa/drivers/dri/r300/r300_draw.c
View File

@ -29,7 +29,6 @@
#include "main/glheader.h"
#include "main/context.h"
#include "main/state.h"
#include "main/api_validate.h"
#include "main/enums.h"
#include "main/simple_list.h"
@ -47,8 +46,6 @@
#include "tnl/tnl.h"
#include "tnl/t_vp_build.h"
#include "vbo/vbo_context.h"
#include "swrast/swrast.h"
#include "swrast_setup/swrast_setup.h"
static int getTypeSize(GLenum type)

4
src/mesa/drivers/dri/r300/r300_emit.c
View File

@ -39,19 +39,17 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "main/colormac.h"
#include "main/imports.h"
#include "main/macros.h"
#include "main/image.h"
#include "swrast_setup/swrast_setup.h"
#include "math/m_translate.h"
#include "tnl/tnl.h"
#include "tnl/t_context.h"
#include "r300_context.h"
#include "r300_state.h"
#include "r300_emit.h"
#include "r300_render.h"
#include "r300_swtcl.h"
GLuint r300VAPInputCntl0(GLcontext * ctx, GLuint InputsRead)
{
/* No idea what this value means. I have seen other values written to

2
src/mesa/drivers/dri/r300/r300_fragprog_common.c
View File

@ -38,14 +38,12 @@
#include "r300_fragprog_common.h"
#include "shader/program.h"
#include "shader/prog_parameter.h"
#include "shader/prog_print.h"
#include "compiler/radeon_compiler.h"
#include "radeon_mesa_to_rc.h"
#include "r300_state.h"
static GLuint build_dtm(GLuint depthmode)

5
src/mesa/drivers/dri/r300/r300_render.c
View File

@ -53,7 +53,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "r300_render.h"
#include "main/glheader.h"
#include "main/state.h"
#include "main/imports.h"
#include "main/enums.h"
#include "main/macros.h"
@ -65,14 +64,10 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "swrast_setup/swrast_setup.h"
#include "vbo/vbo.h"
#include "vbo/vbo_split.h"
#include "tnl/tnl.h"
#include "tnl/t_vp_build.h"
#include "r300_context.h"
#include "r300_state.h"
#include "r300_reg.h"
#include "r300_tex.h"
#include "r300_emit.h"
#include "r300_fragprog_common.h"
#include "r300_swtcl.h"
/**

3
src/mesa/drivers/dri/r300/r300_state.c
View File

@ -58,13 +58,10 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "r300_state.h"
#include "r300_reg.h"
#include "r300_emit.h"
#include "r300_tex.h"
#include "r300_fragprog_common.h"
#include "r300_render.h"
#include "r300_vertprog.h"
#include "drirenderbuffer.h"
static void r300BlendColor(GLcontext * ctx, const GLfloat cf[4])
{
r300ContextPtr rmesa = R300_CONTEXT(ctx);

4
src/mesa/drivers/dri/r300/r300_tex.c
View File

@ -41,18 +41,14 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "main/mipmap.h"
#include "main/simple_list.h"
#include "main/texstore.h"
#include "main/teximage.h"
#include "main/texobj.h"
#include "texmem.h"
#include "r300_context.h"
#include "r300_state.h"
#include "radeon_mipmap_tree.h"
#include "r300_tex.h"
#include "xmlpool.h"
static unsigned int translate_wrap_mode(GLenum wrapmode)
{

1
src/mesa/drivers/dri/r300/r300_texstate.c
View File

@ -45,7 +45,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "main/simple_list.h"
#include "r300_context.h"
#include "r300_state.h"
#include "radeon_mipmap_tree.h"
#include "r300_tex.h"
#include "r300_reg.h"

1
src/mesa/drivers/dri/r300/r300_vertprog.c
View File

@ -34,7 +34,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "shader/program.h"
#include "shader/programopt.h"
#include "shader/prog_instruction.h"
#include "shader/prog_optimize.h"
#include "shader/prog_parameter.h"
#include "shader/prog_print.h"
#include "shader/prog_statevars.h"

1
src/mesa/drivers/dri/radeon/radeon_cs_legacy.c
View File

@ -180,7 +180,6 @@ static int cs_begin(struct radeon_cs_int *cs,
if (cs->cdw + ndw > cs->ndw) {
uint32_t tmp, *ptr;
int num = (ndw > 0x3FF) ? ndw : 0x3FF;
tmp = (cs->cdw + ndw + 0x3ff) & (~0x3ff);
ptr = (uint32_t*)realloc(cs->packets, 4 * tmp);

4
src/mesa/drivers/dri/savage/savagedd.c
View File

@ -29,15 +29,11 @@
#include <stdio.h>
#include "main/mm.h"
#include "swrast/swrast.h"
#include "savagedd.h"
#include "savagestate.h"
#include "savagespan.h"
#include "savagetex.h"
#include "savagetris.h"
#include "savagecontext.h"
#include "main/extensions.h"
#include "utils.h"

2
src/mesa/drivers/dri/savage/savageioctl.c
View File

@ -37,12 +37,10 @@
#include "savagecontext.h"
#include "savageioctl.h"
#include "savage_bci.h"
#include "savagestate.h"
#include "savagespan.h"
#include "drm.h"
#include <sys/ioctl.h>
#include <sys/timeb.h>
#define DEPTH_SCALE_16 ((1<<16)-1)

1
src/mesa/drivers/dri/savage/savagerender.c
View File

@ -36,7 +36,6 @@
#include "tnl/t_context.h"
#include "savagecontext.h"
#include "savagetris.h"
#include "savagestate.h"
#include "savageioctl.h"

1
src/mesa/drivers/dri/savage/savagespan.c
View File

@ -26,7 +26,6 @@
#include "savagedd.h"
#include "savagespan.h"
#include "savageioctl.h"
#include "savage_bci.h"
#include "savage_3d_reg.h"
#include "swrast/swrast.h"

2
src/mesa/drivers/dri/savage/savagetex.c
View File

@ -33,8 +33,6 @@
#include "main/simple_list.h"
#include "main/enums.h"
#include "swrast/swrast.h"
#include "savagecontext.h"
#include "savagetex.h"
#include "savagetris.h"

1
src/mesa/drivers/dri/savage/savagetris.c
View File

@ -52,7 +52,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "savagestate.h"
#include "savagetex.h"
#include "savageioctl.h"
#include "savage_bci.h"
static void savageRasterPrimitive( GLcontext *ctx, GLuint prim );
static void savageRenderPrimitive( GLcontext *ctx, GLenum prim );

2
src/mesa/drivers/dri/sis/sis6326_state.c
View File

@ -34,14 +34,12 @@
#include "sis_reg.h"
#include "main/context.h"
#include "main/enums.h"
#include "main/colormac.h"
#include "swrast/swrast.h"
#include "vbo/vbo.h"
#include "tnl/tnl.h"
#include "swrast_setup/swrast_setup.h"
#include "tnl/t_pipeline.h"
/* =============================================================
* Alpha blending

3
src/mesa/drivers/dri/sis/sis_context.c
View File

@ -43,8 +43,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "sis_alloc.h"
#include "main/imports.h"
#include "main/matrix.h"
#include "main/extensions.h"
#include "utils.h"
#include "main/framebuffer.h"
@ -55,7 +53,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "vbo/vbo.h"
#include "tnl/tnl.h"
#include "tnl/t_pipeline.h"
#define need_GL_EXT_fog_coord
#define need_GL_EXT_secondary_color

2
src/mesa/drivers/dri/sis/sis_dd.c
View File

@ -40,9 +40,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "sis_state.h"
#include "sis_tris.h"
#include "swrast/swrast.h"
#include "main/formats.h"
#include "main/framebuffer.h"
#include "main/renderbuffer.h"
#include "utils.h"

1
src/mesa/drivers/dri/sis/sis_fog.c
View File

@ -33,7 +33,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "sis_context.h"
#include "sis_state.h"
#include "swrast/swrast.h"
#include "main/macros.h"

1
src/mesa/drivers/dri/sis/sis_screen.c
View File

@ -39,7 +39,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "sis_context.h"
#include "sis_dri.h"
#include "sis_lock.h"
#include "sis_span.h"
#include "xmlpool.h"

4
src/mesa/drivers/dri/sis/sis_state.c
View File

@ -35,17 +35,13 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "sis_state.h"
#include "sis_tris.h"
#include "sis_lock.h"
#include "sis_tex.h"
#include "main/context.h"
#include "main/enums.h"
#include "main/colormac.h"
#include "swrast/swrast.h"
#include "vbo/vbo.h"
#include "tnl/tnl.h"
#include "swrast_setup/swrast_setup.h"
#include "tnl/t_pipeline.h"
/* =============================================================
* Alpha blending

1
src/mesa/drivers/dri/sis/sis_tex.c
View File

@ -31,7 +31,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "swrast/swrast.h"
#include "main/imports.h"
#include "main/texstore.h"
#include "main/teximage.h"
#include "main/texobj.h"
#include "sis_context.h"

1
src/mesa/drivers/dri/sis/sis_texstate.c
View File

@ -38,7 +38,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "main/macros.h"
#include "sis_context.h"
#include "sis_state.h"
#include "sis_tex.h"
#include "sis_tris.h"
#include "sis_alloc.h"

1
src/mesa/drivers/dri/sis/sis_tris.c
View File

@ -47,7 +47,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "sis_state.h"
#include "sis_lock.h"
#include "sis_span.h"
#include "sis_alloc.h"
#include "sis_tex.h"
/* 6326 and 300-series shared */

7
src/mesa/drivers/dri/tdfx/tdfx_dd.c
View File

@ -35,17 +35,10 @@
#include "tdfx_context.h"
#include "tdfx_dd.h"
#include "tdfx_lock.h"
#include "tdfx_vb.h"
#include "tdfx_pixels.h"
#include "utils.h"
#include "main/context.h"
#include "main/enums.h"
#include "main/framebuffer.h"
#include "swrast/swrast.h"
#if defined(USE_X86_ASM)
#include "x86/common_x86_asm.h"
#endif
#define DRIVER_DATE "20061113"

1
src/mesa/drivers/dri/tdfx/tdfx_lock.c
View File

@ -38,7 +38,6 @@
#include "tdfx_state.h"
#include "tdfx_render.h"
#include "tdfx_texman.h"
#include "tdfx_tris.h"
#include "drirenderbuffer.h"

1
src/mesa/drivers/dri/tdfx/tdfx_pixels.c
View File

@ -38,7 +38,6 @@
#include "tdfx_context.h"
#include "tdfx_dd.h"
#include "tdfx_lock.h"
#include "tdfx_vb.h"
#include "tdfx_pixels.h"
#include "tdfx_render.h"

2
src/mesa/drivers/dri/tdfx/tdfx_screen.c
View File

@ -36,9 +36,7 @@
#include "tdfx_dri.h"
#include "tdfx_context.h"
#include "tdfx_lock.h"
#include "tdfx_vb.h"
#include "tdfx_span.h"
#include "tdfx_tris.h"
#include "main/framebuffer.h"
#include "main/renderbuffer.h"

4
src/mesa/drivers/dri/tdfx/tdfx_state.c
View File

@ -40,8 +40,6 @@
#include "main/mtypes.h"
#include "main/colormac.h"
#include "main/texstore.h"
#include "main/teximage.h"
#include "swrast/swrast.h"
#include "vbo/vbo.h"
@ -51,11 +49,9 @@
#include "tdfx_context.h"
#include "tdfx_state.h"
#include "tdfx_vb.h"
#include "tdfx_tex.h"
#include "tdfx_texman.h"
#include "tdfx_texstate.h"
#include "tdfx_tris.h"
#include "tdfx_render.h"

1
src/mesa/drivers/dri/tdfx/tdfx_texman.c
View File

@ -35,7 +35,6 @@
*/
#include "tdfx_context.h"
#include "tdfx_tex.h"
#include "tdfx_texman.h"
#include "main/texobj.h"
#include "main/hash.h"

1
src/mesa/drivers/dri/tdfx/tdfx_texstate.c
View File

@ -38,7 +38,6 @@
*/
#include "tdfx_state.h"
#include "tdfx_tex.h"
#include "tdfx_texman.h"
#include "tdfx_texstate.h"

5
src/mesa/drivers/dri/tdfx/tdfx_vb.c
View File

@ -29,13 +29,8 @@
#include "main/macros.h"
#include "main/colormac.h"
#include "math/m_translate.h"
#include "swrast_setup/swrast_setup.h"
#include "tdfx_context.h"
#include "tdfx_vb.h"
#include "tdfx_tris.h"
#include "tdfx_state.h"
#include "tdfx_render.h"
static void copy_pv( GLcontext *ctx, GLuint edst, GLuint esrc )

2
src/mesa/glapi/gl_x86_asm.py
View File

@ -73,7 +73,7 @@ class PrintGenericStubs(gl_XML.gl_print_base):
print ''
print '#define GL_OFFSET(x) CODEPTR(REGOFF(4 * x, EAX))'
print ''
print '#if defined(GNU_ASSEMBLER) && !defined(__DJGPP__) && !defined(__MINGW32__)'
print '#if defined(GNU_ASSEMBLER) && !defined(__DJGPP__) && !defined(__MINGW32__) && !defined(__APPLE__)'
print '#define GLOBL_FN(x) GLOBL x ; .type x, function'
print '#else'
print '#define GLOBL_FN(x) GLOBL x'

6
src/mesa/main/scissor.c
View File

@ -37,14 +37,14 @@ _mesa_Scissor( GLint x, GLint y, GLsizei width, GLsizei height )
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END(ctx);
if (MESA_VERBOSE & VERBOSE_API)
_mesa_debug(ctx, "glScissor %d %d %d %d\n", x, y, width, height);
if (width < 0 || height < 0) {
_mesa_error( ctx, GL_INVALID_VALUE, "glScissor" );
return;
}
if (MESA_VERBOSE & VERBOSE_API)
_mesa_debug(ctx, "glScissor %d %d %d %d\n", x, y, width, height);
_mesa_set_scissor(ctx, x, y, width, height);
}

17
src/mesa/state_tracker/st_atom_scissor.c
View File

@ -31,6 +31,7 @@
*/
#include "main/macros.h"
#include "st_context.h"
#include "pipe/p_context.h"
#include "st_atom.h"
@ -52,15 +53,19 @@ update_scissor( struct st_context *st )
scissor.maxy = fb->Height;
if (st->ctx->Scissor.Enabled) {
if ((GLuint)st->ctx->Scissor.X > scissor.minx)
/* need to be careful here with xmax or ymax < 0 */
GLint xmax = MAX2(0, st->ctx->Scissor.X + st->ctx->Scissor.Width);
GLint ymax = MAX2(0, st->ctx->Scissor.Y + st->ctx->Scissor.Height);
if (st->ctx->Scissor.X > (GLint)scissor.minx)
scissor.minx = st->ctx->Scissor.X;
if ((GLuint)st->ctx->Scissor.Y > scissor.miny)
if (st->ctx->Scissor.Y > (GLint)scissor.miny)
scissor.miny = st->ctx->Scissor.Y;
if ((GLuint)st->ctx->Scissor.X + st->ctx->Scissor.Width < scissor.maxx)
scissor.maxx = st->ctx->Scissor.X + st->ctx->Scissor.Width;
if ((GLuint)st->ctx->Scissor.Y + st->ctx->Scissor.Height < scissor.maxy)
scissor.maxy = st->ctx->Scissor.Y + st->ctx->Scissor.Height;
if (xmax < (GLint) scissor.maxx)
scissor.maxx = xmax;
if (ymax < (GLint) scissor.maxy)
scissor.maxy = ymax;
/* check for null space */
if (scissor.minx >= scissor.maxx || scissor.miny >= scissor.maxy)

4
src/mesa/x86/assyntax.h
View File

@ -1735,9 +1735,9 @@ SECTION _DATA public align=16 class=DATA use32 flat
* If we build with gcc's -fvisibility=hidden flag, we'll need to change
* the symbol visibility mode to 'default'.
*/
#if defined(GNU_ASSEMBLER) && !defined(__DJGPP__) && !defined(__MINGW32__)
#if defined(GNU_ASSEMBLER) && !defined(__DJGPP__) && !defined(__MINGW32__) && !defined(__APPLE__)
# define HIDDEN(x) .hidden x
#elif defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 303 && !defined(__DJGPP__) && !defined(__MINGW32__)
#elif defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 303 && !defined(__DJGPP__) && !defined(__MINGW32__) && !defined(__APPLE__)
# pragma GCC visibility push(default)
# define HIDDEN(x) .hidden x
#else

2
src/mesa/x86/glapi_x86.S
View File

@ -46,7 +46,7 @@
#define GL_OFFSET(x) CODEPTR(REGOFF(4 * x, EAX))
#if defined(GNU_ASSEMBLER) && !defined(__DJGPP__) && !defined(__MINGW32__)
#if defined(GNU_ASSEMBLER) && !defined(__DJGPP__) && !defined(__MINGW32__) && !defined(__APPLE__)
#define GLOBL_FN(x) GLOBL x ; .type x, function
#else
#define GLOBL_FN(x) GLOBL x

4
src/mesa/x86/read_rgba_span_x86.S
View File

@ -31,7 +31,7 @@
*/
.file "read_rgba_span_x86.S"
#if !defined(__DJGPP__) && !defined(__MINGW32__) /* this one cries for assyntax.h */
#if !defined(__DJGPP__) && !defined(__MINGW32__) && !defined(__APPLE__) /* this one cries for assyntax.h */
/* Kevin F. Quinn 2nd July 2006
* Replaced data segment constants with text-segment instructions.
*/
@ -671,7 +671,7 @@ _generic_read_RGBA_span_RGB565_MMX:
emms
#endif
ret
#endif /* !defined(__DJGPP__) && !defined(__MINGW32__) */
#endif /* !defined(__DJGPP__) && !defined(__MINGW32__) && !defined(__APPLE__) */
#if defined (__ELF__) && defined (__linux__)
.section .note.GNU-stack,"",%progbits