fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 22:38:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'mesa_7_6_branch' into mesa_7_7_branch

Browse source 
Conflicts:
	src/gallium/drivers/softpipe/sp_quad_blend.c
This commit is contained in:
Ian Romanick 2009-12-15 12:38:01 -08:00
commit 11522b74b3
26 changed files with 92 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
progs/redbook/aaindex.c
View file

@ -56,7 +56,7 @@ static float rotAngle = 0.;
* at RAMP1START, and a blue color ramp starting
* at RAMP2START. The ramps must be a multiple of 16.
*/
void init(void)
static void init(void)
{
int i;
@ -76,7 +76,7 @@ void init(void)
/* Draw 2 diagonal lines to form an X
*/
void display(void)
static void display(void)
{
glClear(GL_COLOR_BUFFER_BIT);
@ -101,7 +101,7 @@ void display(void)
glFlush();
}
void reshape(int w, int h)
static void reshape(int w, int h)
{
glViewport(0, 0, (GLsizei) w, (GLsizei) h);
glMatrixMode(GL_PROJECTION);
@ -117,7 +117,7 @@ void reshape(int w, int h)
}
/* ARGSUSED1 */
void keyboard(unsigned char key, int x, int y)
static void keyboard(unsigned char key, int x, int y)
{
switch (key) {
case 'r':

8
progs/tests/cva.c
View file

@ -39,7 +39,7 @@ GLboolean compiled = GL_TRUE;
GLboolean doubleBuffer = GL_TRUE;
void init( void )
static void init( void )
{
glClearColor( 0.0, 0.0, 0.0, 0.0 );
glShadeModel( GL_SMOOTH );
@ -69,7 +69,7 @@ void init( void )
#endif
}
void display( void )
static void display( void )
{
glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
@ -81,7 +81,7 @@ void display( void )
}
}
void keyboard( unsigned char key, int x, int y )
static void keyboard( unsigned char key, int x, int y )
{
switch ( key ) {
case 27:
@ -92,7 +92,7 @@ void keyboard( unsigned char key, int x, int y )
glutPostRedisplay();
}
GLboolean args( int argc, char **argv )
static GLboolean args( int argc, char **argv )
{
GLint i;

10
progs/tests/vpeval.c
View file

@ -94,16 +94,16 @@ GLfloat colorPoints[4][4][4] =
};
void
static void
initlights(void)
{
#if 0 /* no lighting for now */
GLfloat ambient[] = {0.2, 0.2, 0.2, 1.0};
GLfloat position[] = {0.0, 0.0, 2.0, 1.0};
GLfloat mat_diffuse[] = {0.6, 0.6, 0.6, 1.0};
GLfloat mat_specular[] = {1.0, 1.0, 1.0, 1.0};
GLfloat mat_shininess[] = {50.0};
#if 0 /* no lighting for now */
glEnable(GL_LIGHTING);
glEnable(GL_LIGHT0);
@ -116,7 +116,7 @@ initlights(void)
#endif
}
void
static void
display(void)
{
glClearColor(.3, .3, .3, 0);
@ -130,7 +130,7 @@ display(void)
glFlush();
}
void
static void
myinit(int argc, char *argv[])
{
glClearColor(0.0, 0.0, 0.0, 1.0);
@ -186,7 +186,7 @@ myinit(int argc, char *argv[])
}
}
void
static void
myReshape(int w, int h)
{
glViewport(0, 0, w, h);

6
progs/trivial/tri-blend-max.c
View file

@ -83,7 +83,7 @@ static void drawRightTriangle(void)
glDisable (GL_BLEND);
}
void display(void)
static void display(void)
{
glClear(GL_COLOR_BUFFER_BIT);
@ -99,7 +99,7 @@ void display(void)
glFlush();
}
void reshape(int w, int h)
static void reshape(int w, int h)
{
glViewport(0, 0, (GLsizei) w, (GLsizei) h);
glMatrixMode(GL_PROJECTION);
@ -111,7 +111,7 @@ void reshape(int w, int h)
}
/* ARGSUSED1 */
void keyboard(unsigned char key, int x, int y)
static void keyboard(unsigned char key, int x, int y)
{
switch (key) {
case 't':

6
progs/trivial/tri-blend-min.c
View file

@ -83,7 +83,7 @@ static void drawRightTriangle(void)
glDisable (GL_BLEND);
}
void display(void)
static void display(void)
{
glClear(GL_COLOR_BUFFER_BIT);
@ -99,7 +99,7 @@ void display(void)
glFlush();
}
void reshape(int w, int h)
static void reshape(int w, int h)
{
glViewport(0, 0, (GLsizei) w, (GLsizei) h);
glMatrixMode(GL_PROJECTION);
@ -111,7 +111,7 @@ void reshape(int w, int h)
}
/* ARGSUSED1 */
void keyboard(unsigned char key, int x, int y)
static void keyboard(unsigned char key, int x, int y)
{
switch (key) {
case 't':

6
progs/trivial/tri-blend-revsub.c
View file

@ -83,7 +83,7 @@ static void drawRightTriangle(void)
glDisable (GL_BLEND);
}
void display(void)
static void display(void)
{
glClear(GL_COLOR_BUFFER_BIT);
@ -99,7 +99,7 @@ void display(void)
glFlush();
}
void reshape(int w, int h)
static void reshape(int w, int h)
{
glViewport(0, 0, (GLsizei) w, (GLsizei) h);
glMatrixMode(GL_PROJECTION);
@ -111,7 +111,7 @@ void reshape(int w, int h)
}
/* ARGSUSED1 */
void keyboard(unsigned char key, int x, int y)
static void keyboard(unsigned char key, int x, int y)
{
switch (key) {
case 't':

6
progs/trivial/tri-blend-sub.c
View file

@ -83,7 +83,7 @@ static void drawRightTriangle(void)
glDisable (GL_BLEND);
}
void display(void)
static void display(void)
{
glClear(GL_COLOR_BUFFER_BIT);
@ -99,7 +99,7 @@ void display(void)
glFlush();
}
void reshape(int w, int h)
static void reshape(int w, int h)
{
glViewport(0, 0, (GLsizei) w, (GLsizei) h);
glMatrixMode(GL_PROJECTION);
@ -111,7 +111,7 @@ void reshape(int w, int h)
}
/* ARGSUSED1 */
void keyboard(unsigned char key, int x, int y)
static void keyboard(unsigned char key, int x, int y)
{
switch (key) {
case 't':

6
progs/trivial/tri-blend.c
View file

@ -81,7 +81,7 @@ static void drawRightTriangle(void)
glDisable (GL_BLEND);
}
void display(void)
static void display(void)
{
glClear(GL_COLOR_BUFFER_BIT);
@ -97,7 +97,7 @@ void display(void)
glFlush();
}
void reshape(int w, int h)
static void reshape(int w, int h)
{
glViewport(0, 0, (GLsizei) w, (GLsizei) h);
glMatrixMode(GL_PROJECTION);
@ -109,7 +109,7 @@ void reshape(int w, int h)
}
/* ARGSUSED1 */
void keyboard(unsigned char key, int x, int y)
static void keyboard(unsigned char key, int x, int y)
{
switch (key) {
case 't':

3
progs/trivial/tri-fbo-tex.c
View file

@ -189,9 +189,6 @@ Key(unsigned char key, int x, int y)
static void
Init(int argc, char *argv[])
{
static const GLfloat mat[4] = { 1.0, 0.5, 0.5, 1.0 };
GLint i;
if (!glutExtensionSupported("GL_EXT_framebuffer_object")) {
printf("GL_EXT_framebuffer_object not found!\n");
exit(0);

6
progs/trivial/tri-z.c
View file

@ -101,7 +101,7 @@ static void drawRightTriangle(void)
glEnd();
}
void display(void)
static void display(void)
{
printf("GL_CLEAR_DEPTH = %.2f, GL_DEPTH_FUNC = %s, DepthRange(%.1f, %.1f)\n",
clearVal, funcs[curFunc].str, minZ, maxZ);
@ -124,7 +124,7 @@ void display(void)
glFlush();
}
void reshape(int w, int h)
static void reshape(int w, int h)
{
glViewport(0, 0, (GLsizei) w, (GLsizei) h);
glMatrixMode(GL_PROJECTION);
@ -136,7 +136,7 @@ void reshape(int w, int h)
}
/* ARGSUSED1 */
void keyboard(unsigned char key, int x, int y)
static void keyboard(unsigned char key, int x, int y)
{
switch (key) {
case 'n':

4
progs/xdemos/glxinfo.c
View file

@ -116,7 +116,7 @@ print_extension_list(const char *ext)
return;
width = indent;
printf(indentString);
printf("%s", indentString);
i = j = 0;
while (1) {
if (ext[j] == ' ' || ext[j] == 0) {
@ -126,7 +126,7 @@ print_extension_list(const char *ext)
/* start a new line */
printf("\n");
width = indent;
printf(indentString);
printf("%s", indentString);
}
/* print the extension name between ext[i] and ext[j] */
while (i < j) {

1
src/gallium/winsys/drm/intel/gem/intel_drm_api.c
View file

@ -32,6 +32,7 @@ intel_drm_get_device_id(unsigned int *device_id)
}
shutup_gcc = fgets(path, sizeof(path), file);
(void) shutup_gcc;
sscanf(path, "%x", device_id);
fclose(file);
}

8
src/gallium/winsys/xlib/Makefile
View file

@ -84,11 +84,11 @@ depend: $(XLIB_WINSYS_SOURCES)
install: default
$(INSTALL) -d $(INSTALL_DIR)/include/GL
$(INSTALL) -d $(INSTALL_DIR)/$(LIB_DIR)
$(INSTALL) -m 644 $(TOP)/include/GL/*.h $(INSTALL_DIR)/include/GL
$(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/include/GL
$(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)
$(INSTALL) -m 644 $(TOP)/include/GL/*.h $(DESTDIR)$(INSTALL_DIR)/include/GL
@if [ -e $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) ]; then \
$(MINSTALL) $(TOP)/$(LIB_DIR)/libGL* $(INSTALL_DIR)/$(LIB_DIR); \
$(MINSTALL) $(TOP)/$(LIB_DIR)/libGL* $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR); \
fi

5
src/glut/glx/glut_menu.c
View file

@ -225,6 +225,7 @@ menuVisualSetup(void)
if (!status) {
XFreeColormap(__glutDisplay, menuColormap);
free(placeHolders);
placeHolders = NULL;
continue;
}
}
@ -241,6 +242,7 @@ menuVisualSetup(void)
XFreeColormap(__glutDisplay, menuColormap);
if (placeHolders) {
free(placeHolders);
placeHolders = NULL;
}
continue;
}
@ -252,6 +254,7 @@ menuVisualSetup(void)
XFreeColormap(__glutDisplay, menuColormap);
if (placeHolders) {
free(placeHolders);
placeHolders = NULL;
}
continue;
}
@ -263,6 +266,7 @@ menuVisualSetup(void)
XFreeColormap(__glutDisplay, menuColormap);
if (placeHolders) {
free(placeHolders);
placeHolders = NULL;
}
continue;
}
@ -271,6 +275,7 @@ menuVisualSetup(void)
XFreeColors(__glutDisplay, menuColormap,
placeHolders, numPlaceHolders, 0);
free(placeHolders);
placeHolders = NULL;
}
menuWhite = color.pixel;
menuVisual = visual->vinfo.visual;

3
src/mesa/drivers/dri/i810/i810tris.c
View file

@ -270,7 +270,8 @@ do { \
#define LOCAL_VARS(n) \
i810ContextPtr imesa = I810_CONTEXT(ctx); \
GLuint color[n], spec[n]; \
GLuint color[n] = { 0 }; \
GLuint spec[n] = { 0 }; \
GLuint coloroffset = (imesa->vertex_size == 4 ? 3 : 4); \
GLboolean havespec = (imesa->vertex_size > 4); \
(void) color; (void) spec; (void) coloroffset; (void) havespec;

11
src/mesa/drivers/dri/intel/intel_buffers.c
View file

@ -191,10 +191,15 @@ intel_draw_buffer(GLcontext * ctx, struct gl_framebuffer *fb)
return;
}
/*
* How many color buffers are we drawing into?
/* How many color buffers are we drawing into?
*
* If there are zero buffers or the buffer is too big, don't configure any
* regions for hardware drawing. We'll fallback to software below. Not
* having regions set makes some of the software fallback paths faster.
*/
if (fb->_NumColorDrawBuffers == 0) {
if ((fb->Width > ctx->Const.MaxRenderbufferSize)
|| (fb->Height > ctx->Const.MaxRenderbufferSize)
|| (fb->_NumColorDrawBuffers == 0)) {
/* writing to 0 */
colorRegions[0] = NULL;
intel->constant_cliprect = GL_TRUE;

3
src/mesa/drivers/dri/mach64/mach64_tris.c
View file

@ -1297,7 +1297,8 @@ do { \
#define LOCAL_VARS(n) \
mach64ContextPtr mmesa = MACH64_CONTEXT(ctx); \
GLuint color[n], spec[n]; \
GLuint color[n] = { 0 }; \
GLuint spec[n] = { 0 }; \
GLuint vertex_size = mmesa->vertex_size; \
const GLuint xyoffset = 9; \
const GLuint coloroffset = 8; \

3
src/mesa/drivers/dri/mga/mgatris.c
View file

@ -397,7 +397,8 @@ do { \
#define LOCAL_VARS(n) \
mgaContextPtr mmesa = MGA_CONTEXT(ctx); \
GLuint color[n], spec[n]; \
GLuint color[n] = { 0 }; \
GLuint spec[n] = { 0 }; \
(void) color; (void) spec;

1
src/mesa/shader/slang/slang_compile_operation.c
View file

@ -52,6 +52,7 @@ slang_operation_construct(slang_operation * oper)
_slang_variable_scope_ctr(oper->locals);
oper->fun = NULL;
oper->var = NULL;
oper->label = NULL;
return GL_TRUE;
}

4
src/mesa/state_tracker/st_draw.c
View file

@ -381,7 +381,7 @@ setup_interleaved_attribs(GLcontext *ctx,
{
struct pipe_context *pipe = ctx->st->pipe;
GLuint attr;
const GLubyte *offset0;
const GLubyte *offset0 = NULL;
for (attr = 0; attr < vp->num_inputs; attr++) {
const GLuint mesaAttr = vp->index_to_input[attr];
@ -560,7 +560,7 @@ st_draw_vbo(GLcontext *ctx,
GLuint attr;
struct pipe_vertex_element velements[PIPE_MAX_ATTRIBS];
unsigned num_vbuffers, num_velements;
GLboolean userSpace;
GLboolean userSpace = GL_FALSE;
/* Gallium probably doesn't want this in some cases. */
if (!index_bounds_valid)

2
src/mesa/swrast/s_atifragshader.c
View file

@ -279,7 +279,7 @@ handle_sample_op(GLcontext * ctx, struct atifs_machine *machine,
/* sample from unit idx using texinst->src as coords */
GLuint swizzle = texinst->swizzle;
GLuint coord_source = texinst->src;
GLfloat tex_coords[4];
GLfloat tex_coords[4] = { 0 };
if (coord_source >= GL_TEXTURE0_ARB && coord_source <= GL_TEXTURE7_ARB) {
coord_source -= GL_TEXTURE0_ARB;

6
src/mesa/swrast/s_triangle.c
View file

@ -553,6 +553,9 @@ affine_span(GLcontext *ctx, SWspan *span,
info.format = texImg->TexFormat; \
info.filter = obj->MinFilter; \
info.envmode = unit->EnvMode; \
info.er = 0; \
info.eg = 0; \
info.eb = 0; \
span.arrayMask |= SPAN_RGBA; \
\
if (info.envmode == GL_BLEND) { \
@ -815,6 +818,9 @@ fast_persp_span(GLcontext *ctx, SWspan *span,
info.format = texImg->TexFormat; \
info.filter = obj->MinFilter; \
info.envmode = unit->EnvMode; \
info.er = 0; \
info.eg = 0; \
info.eb = 0; \
\
if (info.envmode == GL_BLEND) { \
/* potential off-by-one error here? (1.0f -> 2048 -> 0) */ \

6
src/mesa/swrast_setup/ss_tritmp.h
View file

@ -41,9 +41,9 @@ static void TAG(triangle)(GLcontext *ctx, GLuint e0, GLuint e1, GLuint e2 )
GLenum mode = GL_FILL;
GLuint facing = 0;
GLchan saved_color[3][4];
GLfloat saved_col0[3][4];
GLfloat saved_spec[3][4];
GLfloat saved_index[3];
GLfloat saved_col0[3][4] = { { 0 } };
GLfloat saved_spec[3][4] = { { 0 } };
GLfloat saved_index[3] = { 0 };
v[0] = &verts[e0];
v[1] = &verts[e1];

9
src/mesa/tnl_dd/t_dd_dmatmp.h
View file

@ -241,6 +241,7 @@ static void TAG(render_line_loop_verts)( GLcontext *ctx,
tmp = ALLOC_VERTS(nr+1);
tmp = TAG(emit_verts)( ctx, j, nr, tmp );
tmp = TAG(emit_verts)( ctx, start, 1, tmp );
(void) tmp;
}
else {
TAG(emit_verts)( ctx, j, nr, ALLOC_VERTS(nr) );
@ -254,6 +255,7 @@ static void TAG(render_line_loop_verts)( GLcontext *ctx,
tmp = ALLOC_VERTS(2);
tmp = TAG(emit_verts)( ctx, start+1, 1, tmp );
tmp = TAG(emit_verts)( ctx, start, 1, tmp );
(void) tmp;
}
FLUSH();
@ -358,6 +360,7 @@ static void TAG(render_tri_fan_verts)( GLcontext *ctx,
tmp = ALLOC_VERTS( nr );
tmp = TAG(emit_verts)( ctx, start, 1, tmp );
tmp = TAG(emit_verts)( ctx, j, nr - 1, tmp );
(void) tmp;
currentsz = dmasz;
}
@ -397,6 +400,7 @@ static void TAG(render_poly_verts)( GLcontext *ctx,
tmp = ALLOC_VERTS( nr );
tmp = TAG(emit_verts)( ctx, start, 1, tmp );
tmp = TAG(emit_verts)( ctx, j, nr - 1, tmp );
(void) tmp;
currentsz = dmasz;
}
@ -634,6 +638,7 @@ static void TAG(render_quads_verts)( GLcontext *ctx,
/* Send v1, v2, v3
*/
tmp = EMIT_VERTS(ctx, j + 1, 3, tmp);
(void) tmp;
}
}
else {
@ -820,6 +825,7 @@ static void TAG(render_line_loop_elts)( GLcontext *ctx,
tmp = ALLOC_ELTS(nr+1);
tmp = TAG(emit_elts)( ctx, elts+j, nr, tmp );
tmp = TAG(emit_elts)( ctx, elts+start, 1, tmp );
(void) tmp;
}
else {
TAG(emit_elts)( ctx, elts+j, nr, ALLOC_ELTS(nr) );
@ -833,6 +839,7 @@ static void TAG(render_line_loop_elts)( GLcontext *ctx,
tmp = ALLOC_ELTS(2);
tmp = TAG(emit_elts)( ctx, elts+start+1, 1, tmp );
tmp = TAG(emit_elts)( ctx, elts+start, 1, tmp );
(void) tmp;
}
FLUSH();
@ -946,6 +953,7 @@ static void TAG(render_tri_fan_elts)( GLcontext *ctx,
tmp = ALLOC_ELTS( nr );
tmp = TAG(emit_elts)( ctx, elts+start, 1, tmp );
tmp = TAG(emit_elts)( ctx, elts+j, nr - 1, tmp );
(void) tmp;
FLUSH();
currentsz = dmasz;
}
@ -983,6 +991,7 @@ static void TAG(render_poly_elts)( GLcontext *ctx,
tmp = ALLOC_ELTS( nr );
tmp = TAG(emit_elts)( ctx, elts+start, 1, tmp );
tmp = TAG(emit_elts)( ctx, elts+j, nr - 1, tmp );
(void) tmp;
FLUSH();
currentsz = dmasz;
}

11
src/mesa/tnl_dd/t_dd_dmatmp2.h
View file

@ -266,6 +266,7 @@ static void TAG(render_line_loop_verts)( GLcontext *ctx,
if (j + nr < count) {
ELT_TYPE *dest = ALLOC_ELTS( nr );
dest = TAG(emit_consecutive_elts)( ctx, dest, j, nr );
(void) dest;
j += nr - 1;
CLOSE_ELTS();
}
@ -273,6 +274,7 @@ static void TAG(render_line_loop_verts)( GLcontext *ctx,
ELT_TYPE *dest = ALLOC_ELTS( nr + 1 );
dest = TAG(emit_consecutive_elts)( ctx, dest, j, nr );
dest = TAG(emit_consecutive_elts)( ctx, dest, start, 1 );
(void) dest;
j += nr;
CLOSE_ELTS();
}
@ -554,6 +556,7 @@ static void TAG(render_points_elts)( GLcontext *ctx,
nr = MIN2( dmasz, count - j );
dest = ALLOC_ELTS( nr );
dest = TAG(emit_elts)( ctx, dest, elts+j, nr );
(void) dest;
CLOSE_ELTS();
}
}
@ -590,6 +593,7 @@ static void TAG(render_lines_elts)( GLcontext *ctx,
nr = MIN2( dmasz, count - j );
dest = ALLOC_ELTS( nr );
dest = TAG(emit_elts)( ctx, dest, elts+j, nr );
(void) dest;
CLOSE_ELTS();
}
@ -621,6 +625,7 @@ static void TAG(render_line_strip_elts)( GLcontext *ctx,
nr = MIN2( dmasz, count - j );
dest = ALLOC_ELTS( nr );
dest = TAG(emit_elts)( ctx, dest, elts+j, nr );
(void) dest;
CLOSE_ELTS();
}
}
@ -671,6 +676,7 @@ static void TAG(render_line_loop_elts)( GLcontext *ctx,
j += nr - 1;
if (j + 1 >= count && (flags & PRIM_END)) {
dest = TAG(emit_elts)( ctx, dest, elts+start, 1 );
(void) dest;
}
CLOSE_ELTS();
}
@ -703,6 +709,7 @@ static void TAG(render_triangles_elts)( GLcontext *ctx,
nr = MIN2( dmasz, count - j );
dest = ALLOC_ELTS( nr );
dest = TAG(emit_elts)( ctx, dest, elts+j, nr );
(void) dest;
CLOSE_ELTS();
}
}
@ -734,6 +741,7 @@ static void TAG(render_tri_strip_elts)( GLcontext *ctx,
dest = ALLOC_ELTS( nr );
dest = TAG(emit_elts)( ctx, dest, elts+j, nr );
(void) dest;
CLOSE_ELTS();
}
}
@ -759,6 +767,7 @@ static void TAG(render_tri_fan_elts)( GLcontext *ctx,
dest = ALLOC_ELTS( nr );
dest = TAG(emit_elts)( ctx, dest, elts+start, 1 );
dest = TAG(emit_elts)( ctx, dest, elts+j, nr - 1 );
(void) dest;
CLOSE_ELTS();
}
}
@ -785,6 +794,7 @@ static void TAG(render_poly_elts)( GLcontext *ctx,
dest = ALLOC_ELTS( nr );
dest = TAG(emit_elts)( ctx, dest, elts+start, 1 );
dest = TAG(emit_elts)( ctx, dest, elts+j, nr - 1 );
(void) dest;
CLOSE_ELTS();
}
}
@ -843,6 +853,7 @@ static void TAG(render_quad_strip_elts)( GLcontext *ctx,
nr = MIN2( dmasz, count - j );
dest = ALLOC_ELTS( nr );
dest = TAG(emit_elts)( ctx, dest, elts+j, nr );
(void) dest;
CLOSE_ELTS();
}
}

2
src/mesa/x86/rtasm/x86sse.c
View file

@ -7,10 +7,12 @@
#define DISASSEM 0
#define X86_TWOB 0x0f
#if 0
static unsigned char *cptr( void (*label)() )
{
return (unsigned char *)(unsigned long)label;
}
#endif
static void do_realloc( struct x86_function *p )