fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-30 23:00:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch '7.8' into master

Browse source 
Conflicts:
	Makefile
	src/mesa/main/version.h
This commit is contained in:
Pauli Nieminen 2010-03-17 11:26:48 +02:00
commit f0f04cd12d
10 changed files with 25 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Makefile
View file

@ -243,7 +243,6 @@ MAIN_FILES = \
$(DIRECTORY)/src/mesa/shader/descrip.mms \
$(DIRECTORY)/src/mesa/shader/slang/*.[ch] \
$(DIRECTORY)/src/mesa/shader/slang/descrip.mms \
$(DIRECTORY)/src/mesa/shader/slang/library/*.[ch] \
$(DIRECTORY)/src/mesa/shader/slang/library/*.gc \
$(DIRECTORY)/src/mesa/shader/slang/library/Makefile \
$(DIRECTORY)/src/mesa/swrast/*.[ch] \
@ -379,15 +378,6 @@ SGI_GLU_FILES = \
$(DIRECTORY)/src/glu/sgi/libtess/*.[ch] \
$(DIRECTORY)/src/glu/sgi/libutil/*.[ch]
MESA_GLU_FILES = \
$(DIRECTORY)/src/glu/mesa/README[12] \
$(DIRECTORY)/src/glu/mesa/Makefile* \
$(DIRECTORY)/src/glu/mesa/descrip.mms \
$(DIRECTORY)/src/glu/mesa/mms_depend \
$(DIRECTORY)/src/glu/mesa/*.def \
$(DIRECTORY)/src/glu/mesa/depend \
$(DIRECTORY)/src/glu/mesa/*.[ch]
GLW_FILES = \
$(DIRECTORY)/src/glw/*.[ch] \
$(DIRECTORY)/src/glw/Makefile* \
@ -450,11 +440,7 @@ GLUT_FILES = \
$(DIRECTORY)/src/glut/glx/*.[ch] \
$(DIRECTORY)/src/glut/beos/*.[ch] \
$(DIRECTORY)/src/glut/beos/*.cpp \
$(DIRECTORY)/src/glut/beos/Makefile \
$(DIRECTORY)/src/glut/fbdev/Makefile \
$(DIRECTORY)/src/glut/fbdev/*[ch] \
$(DIRECTORY)/src/glut/mini/*[ch] \
$(DIRECTORY)/src/glut/mini/glut.pc.in \
$(DIRECTORY)/src/glut/beos/Makefile
DEPEND_FILES = \
$(TOP)/src/mesa/depend \

2
src/mesa/drivers/dri/r600/r700_state.c
View file

@ -615,7 +615,7 @@ static GLuint translate_logicop(GLenum logicop)
case GL_XOR:
return 0x66;
case GL_EQUIV:
return 0xaa;
return 0x99;
case GL_AND_REVERSE:
return 0x44;
case GL_AND_INVERTED:

7
src/mesa/drivers/dri/radeon/radeon_dma.c
View file

@ -184,9 +184,6 @@ void radeonRefillCurrentDmaRegion(radeonContextPtr rmesa, int size)
radeon_print(RADEON_DMA, RADEON_NORMAL, "%s size %d minimum_size %d\n",
__FUNCTION__, size, rmesa->dma.minimum_size);
if (!is_empty_list(&rmesa->dma.reserved))
radeon_bo_unmap(first_elem(&rmesa->dma.reserved)->bo);
if (is_empty_list(&rmesa->dma.free)
|| last_elem(&rmesa->dma.free)->bo->size < size) {
dma_bo = CALLOC_STRUCT(radeon_dma_bo);
@ -336,9 +333,6 @@ void radeonReleaseDmaRegions(radeonContextPtr rmesa)
legacy_track_pending(rmesa->radeonScreen->bom, 0);
}
if (!is_empty_list(&rmesa->dma.reserved))
radeon_bo_unmap(first_elem(&rmesa->dma.reserved)->bo);
/* move waiting bos to free list.
wait list provides gpu time to handle data before reuse */
foreach_s(dma_bo, temp, &rmesa->dma.wait) {
@ -368,6 +362,7 @@ void radeonReleaseDmaRegions(radeonContextPtr rmesa)
/* move reserved to wait list */
foreach_s(dma_bo, temp, &rmesa->dma.reserved) {
radeon_bo_unmap(dma_bo->bo);
/* free objects that are too small to be used because of large request */
if (dma_bo->bo->size < rmesa->dma.minimum_size) {
radeon_bo_unref(dma_bo->bo);

12
src/mesa/main/imports.c
View file

@ -795,18 +795,20 @@ _mesa_strdup( const char *s )
}
}
/** Wrapper around strtod() */
double
_mesa_strtod( const char *s, char **end )
/** Wrapper around strtof() */
float
_mesa_strtof( const char *s, char **end )
{
#ifdef _GNU_SOURCE
static locale_t loc = NULL;
if (!loc) {
loc = newlocale(LC_CTYPE_MASK, "C", NULL);
}
return strtod_l(s, end, loc);
return strtof_l(s, end, loc);
#elif defined(_ISOC99_SOURCE) || (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE >= 600)
return strtof(s, end);
#else
return strtod(s, end);
return (float)strtod(s, end);
#endif
}

4
src/mesa/main/imports.h
View file

@ -575,8 +575,8 @@ _mesa_getenv( const char *var );
extern char *
_mesa_strdup( const char *s );
extern double
_mesa_strtod( const char *s, char **end );
extern float
_mesa_strtof( const char *s, char **end );
extern unsigned int
_mesa_str_checksum(const char *str);

8
src/mesa/shader/lex.yy.c
View file

@ -2198,7 +2198,7 @@ case 142:
YY_RULE_SETUP
#line 326 "program_lexer.l"
{
yylval->real = (float) _mesa_strtod(yytext, NULL);
yylval->real = _mesa_strtof(yytext, NULL);
return REAL;
}
YY_BREAK
@ -2210,7 +2210,7 @@ YY_DO_BEFORE_ACTION; /* set up yytext again */
YY_RULE_SETUP
#line 330 "program_lexer.l"
{
yylval->real = (float) _mesa_strtod(yytext, NULL);
yylval->real = _mesa_strtof(yytext, NULL);
return REAL;
}
YY_BREAK
@ -2218,7 +2218,7 @@ case 144:
YY_RULE_SETUP
#line 334 "program_lexer.l"
{
yylval->real = (float) _mesa_strtod(yytext, NULL);
yylval->real = _mesa_strtof(yytext, NULL);
return REAL;
}
YY_BREAK
@ -2226,7 +2226,7 @@ case 145:
YY_RULE_SETUP
#line 338 "program_lexer.l"
{
yylval->real = (float) _mesa_strtod(yytext, NULL);
yylval->real = _mesa_strtof(yytext, NULL);
return REAL;
}
YY_BREAK

2
src/mesa/shader/nvfragparse.c
View file

@ -456,7 +456,7 @@ Parse_ScalarConstant(struct parse_state *parseState, GLfloat *number)
{
char *end = NULL;
*number = (GLfloat) _mesa_strtod((const char *) parseState->pos, &end);
*number = (GLfloat) _mesa_strtof((const char *) parseState->pos, &end);
if (end && end > (char *) parseState->pos) {
/* got a number */

8
src/mesa/shader/program_lexer.l
View file

@ -324,19 +324,19 @@ ARRAYSHADOW2D { return_token_or_IDENTIFIER(require_ARB_fp && require
return INTEGER;
}
{num}?{frac}{exp}? {
yylval->real = (float) _mesa_strtod(yytext, NULL);
yylval->real = _mesa_strtof(yytext, NULL);
return REAL;
}
{num}"."/[^.] {
yylval->real = (float) _mesa_strtod(yytext, NULL);
yylval->real = _mesa_strtof(yytext, NULL);
return REAL;
}
{num}{exp} {
yylval->real = (float) _mesa_strtod(yytext, NULL);
yylval->real = _mesa_strtof(yytext, NULL);
return REAL;
}
{num}"."{exp} {
yylval->real = (float) _mesa_strtod(yytext, NULL);
yylval->real = _mesa_strtof(yytext, NULL);
return REAL;
}

4
src/mesa/shader/slang/slang_compile.c
View file

@ -246,7 +246,7 @@ parse_general_number(slang_parse_ctx *ctx, float *number)
if (flt[strlen(flt) - 1] == 'f' || flt[strlen(flt) - 1] == 'F') {
flt[strlen(flt) - 1] = '\0';
}
*number = (float)_mesa_strtod(flt, (char **)NULL);
*number = _mesa_strtof(flt, (char **)NULL);
free(flt);
return 1;
@ -312,7 +312,7 @@ parse_float(slang_parse_ctx * C, float *number)
slang_string_concat(whole, "E");
slang_string_concat(whole, exponent);
*number = (float) (_mesa_strtod(whole, (char **) NULL));
*number = _mesa_strtof(whole, (char **) NULL);
_slang_free(whole);
}

2
src/mesa/state_tracker/st_cb_texture.c
View file

@ -900,6 +900,8 @@ decompress_with_blit(GLcontext * ctx, GLenum target, GLint level,
_mesa_unmap_pbo_dest(ctx, &ctx->Pack);
screen->tex_transfer_destroy(tex_xfer);
/* destroy the temp / dest surface */
util_destroy_rgba_surface(dst_texture, dst_surface);
}