Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
Conflicts: src/mesa/drivers/dri/unichrome/via_ioctl.c src/mesa/drivers/dri/unichrome/via_screen.c src/mesa/main/version.h src/mesa/state_tracker/st_atom.c
This commit is contained in:
Ian Romanick
commit
006a526edb
|
|
@ -59,6 +59,7 @@ tbd
|
|||
<li>Point sprite fixes for i915/945 driver.
|
||||
<li>Fixed assorted memory leaks (usually on error paths)
|
||||
<li>Fixed some GLSL compiler bugs (ex: 25579)
|
||||
<li>Assorted build fixes for BlueGene
|
||||
</ul>
|
||||
|
||||
<h2>Changes</h2>
|
||||
|
|
|
|||
|
|
@ -167,7 +167,7 @@ static int driBindContext(__DRIcontext *pcp,
|
|||
__DRIdrawable *pdp,
|
||||
__DRIdrawable *prp)
|
||||
{
|
||||
__DRIscreenPrivate *psp;
|
||||
__DRIscreenPrivate *psp = NULL;
|
||||
|
||||
/* Bind the drawable to the context */
|
||||
|
||||
|
|
|
|||
|
|
@ -216,7 +216,8 @@ do { \
|
|||
|
||||
#define LOCAL_VARS(n) \
|
||||
r128ContextPtr rmesa = R128_CONTEXT(ctx); \
|
||||
GLuint color[n], spec[n]; \
|
||||
GLuint color[n] = { 0 }; \
|
||||
GLuint spec[n] = { 0 }; \
|
||||
GLuint coloroffset = rmesa->coloroffset; \
|
||||
GLuint specoffset = rmesa->specoffset; \
|
||||
GLboolean havespec = (rmesa->specoffset != 0); \
|
||||
|
|
|
|||
|
|
@ -337,6 +337,8 @@ static void savageDDClear( GLcontext *ctx, GLbitfield mask )
|
|||
GLint ch = ctx->DrawBuffer->_Ymax - cy;
|
||||
|
||||
/* XXX FIX ME: the cx,cy,cw,ch vars are currently ignored! */
|
||||
(void) ch;
|
||||
(void) cw;
|
||||
|
||||
if (SAVAGE_DEBUG & DEBUG_VERBOSE_MSG)
|
||||
fprintf (stderr, "%s\n", __FUNCTION__);
|
||||
|
|
|
|||
|
|
@ -435,7 +435,8 @@ do { \
|
|||
|
||||
#define LOCAL_VARS(n) \
|
||||
savageContextPtr imesa = SAVAGE_CONTEXT(ctx); \
|
||||
GLuint color[n], spec[n]; \
|
||||
GLuint color[n] = { 0 }; \
|
||||
GLuint spec[n] = { 0 }; \
|
||||
GLuint coloroffset = \
|
||||
((imesa->skip & SAVAGE_SKIP_W) ? 3 : 4); \
|
||||
GLboolean specoffset = \
|
||||
|
|
|
|||
|
|
@ -393,7 +393,6 @@ sis_clear_z_stencil_buffer( GLcontext * ctx, GLbitfield mask,
|
|||
GLint x, GLint y, GLint width, GLint height )
|
||||
{
|
||||
sisContextPtr smesa = SIS_CONTEXT(ctx);
|
||||
int cmd;
|
||||
|
||||
mWait3DCmdQueue (8);
|
||||
MMIO(REG_SRC_PITCH, (smesa->zFormat == SiS_ZFORMAT_Z16) ?
|
||||
|
|
|
|||
|
|
@ -430,7 +430,8 @@ do { \
|
|||
|
||||
#define LOCAL_VARS(n) \
|
||||
sisContextPtr smesa = SIS_CONTEXT(ctx); \
|
||||
GLuint color[n], spec[n]; \
|
||||
GLuint color[n] = { 0 }; \
|
||||
GLuint spec[n] = { 0 }; \
|
||||
GLuint coloroffset = smesa->coloroffset; \
|
||||
GLuint specoffset = smesa->specoffset; \
|
||||
(void) color; (void) spec; (void) coloroffset; (void) specoffset;
|
||||
|
|
|
|||
|
|
@ -885,7 +885,6 @@ void viaFlushDmaLocked(struct via_context *vmesa, GLuint flags)
|
|||
}
|
||||
else if (vmesa->numClipRects) {
|
||||
drm_clip_rect_t *pbox = vmesa->pClipRects;
|
||||
__DRIdrawablePrivate *dPriv = vmesa->driDrawable;
|
||||
|
||||
for (i = 0; i < vmesa->numClipRects; i++) {
|
||||
drm_clip_rect_t b;
|
||||
|
|
|
|||
|
|
@ -330,7 +330,8 @@ do { \
|
|||
|
||||
#define LOCAL_VARS(n) \
|
||||
struct via_context *vmesa = VIA_CONTEXT(ctx); \
|
||||
GLuint color[n], spec[n]; \
|
||||
GLuint color[n] = { 0 }; \
|
||||
GLuint spec[n] = { 0 }; \
|
||||
GLuint coloroffset = vmesa->coloroffset; \
|
||||
GLuint specoffset = vmesa->specoffset; \
|
||||
(void)color; (void)spec; (void)coloroffset; (void)specoffset;
|
||||
|
|
|
|||
|
|
@ -234,7 +234,7 @@ extern "C" {
|
|||
#elif defined(__APPLE__)
|
||||
#include <CoreFoundation/CFByteOrder.h>
|
||||
#define CPU_TO_LE32( x ) CFSwapInt32HostToLittle( x )
|
||||
#elif defined(_AIX)
|
||||
#elif (defined(_AIX) || defined(__blrts))
|
||||
#define CPU_TO_LE32( x ) x = ((x & 0x000000ff) << 24) | \
|
||||
((x & 0x0000ff00) << 8) | \
|
||||
((x & 0x00ff0000) >> 8) | \
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
#include "compiler.h"
|
||||
#include "dlopen.h"
|
||||
|
||||
#if defined(_GNU_SOURCE) && !defined(__MINGW32__)
|
||||
#if defined(_GNU_SOURCE) && !defined(__MINGW32__) && !defined(__blrts)
|
||||
#include <dlfcn.h>
|
||||
#endif
|
||||
#if defined(_WIN32)
|
||||
|
|
@ -46,7 +46,9 @@
|
|||
void *
|
||||
_mesa_dlopen(const char *libname, int flags)
|
||||
{
|
||||
#if defined(_GNU_SOURCE)
|
||||
#if defined(__blrts)
|
||||
return NULL;
|
||||
#elif defined(_GNU_SOURCE)
|
||||
flags = RTLD_LAZY | RTLD_GLOBAL; /* Overriding flags at this time */
|
||||
return dlopen(libname, flags);
|
||||
#elif defined(__MINGW32__)
|
||||
|
|
@ -65,7 +67,9 @@ _mesa_dlopen(const char *libname, int flags)
|
|||
GenericFunc
|
||||
_mesa_dlsym(void *handle, const char *fname)
|
||||
{
|
||||
#if defined(__DJGPP__)
|
||||
#if defined(__blrts)
|
||||
return (GenericFunc) NULL
|
||||
#elif defined(__DJGPP__)
|
||||
/* need '_' prefix on symbol names */
|
||||
char fname2[1000];
|
||||
fname2[0] = '_';
|
||||
|
|
@ -88,7 +92,9 @@ _mesa_dlsym(void *handle, const char *fname)
|
|||
void
|
||||
_mesa_dlclose(void *handle)
|
||||
{
|
||||
#if defined(_GNU_SOURCE)
|
||||
#if defined(__blrts)
|
||||
(void) handle;
|
||||
#elif defined(_GNU_SOURCE)
|
||||
dlclose(handle);
|
||||
#elif defined(__MINGW32__)
|
||||
FreeLibrary(handle);
|
||||
|
|
|
|||
|
|
@ -132,7 +132,7 @@ static void TAG(triangle)( GLcontext *ctx, GLuint e0, GLuint e1, GLuint e2 )
|
|||
struct vertex_buffer *VB = &TNL_CONTEXT( ctx )->vb;
|
||||
VERTEX *v[3];
|
||||
GLfloat offset = 0;
|
||||
GLfloat z[3];
|
||||
GLfloat z[3] = { 0 };
|
||||
GLenum mode = GL_FILL;
|
||||
GLuint facing = 0;
|
||||
LOCAL_VARS(3);
|
||||
|
|
@ -395,7 +395,7 @@ static void TAG(quadr)( GLcontext *ctx,
|
|||
struct vertex_buffer *VB = &TNL_CONTEXT( ctx )->vb;
|
||||
VERTEX *v[4];
|
||||
GLfloat offset = 0;
|
||||
GLfloat z[4];
|
||||
GLfloat z[4] = { 0 };
|
||||
GLenum mode = GL_FILL;
|
||||
GLuint facing = 0;
|
||||
LOCAL_VARS(4);
|
||||
|
|
|
|||
Loading…
Reference in New Issue