Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 4632 → Rev 4633

/contrib/sdk/sources/Mesa/src/mapi/Makefile
53,6 → 53,6
$(CC) $(CFLAGS) -std=c99 $(MESA_DEFS) $(INC_MESA) -o $@ $<
 
%.o : %.S Makefile
$(CC) -c -save-temps -U_WIN32 -I $(MESA_SRC)/mesa -o $@ $<
$(CC) -c -U_WIN32 -I $(MESA_SRC)/mesa -o $@ $<
 
/contrib/sdk/sources/Mesa/src/mesa/Makefile
4,7 → 4,7
MESA_SRC:= $(SRC_DIR)/Mesa/src
 
CFLAGS_OPT = -U_Win32 -U_WIN32 -U__MINGW32__ -UWIN32 -U_MSC_VER -Os
CFLAGS_OPT+= -fomit-frame-pointer -mno-ms-bitfields -save-temps
CFLAGS_OPT+= -fomit-frame-pointer -mno-ms-bitfields
CFLAGS = -c $(CFLAGS_OPT)
 
LD = ld
388,7 → 388,7
$(CC) $(CFLAGS) -std=c99 $(MESA_DEFS) $(INC_MESA) $(INC_I965) -o $@ $<
 
%.o : %.S Makefile
$(CC) -c -save-temps -U_WIN32 -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_SSE_ASM -I $(MESA_SRC)/mesa -o $@ $<
$(CC) -c -U_WIN32 -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_SSE_ASM -I $(MESA_SRC)/mesa -o $@ $<
 
%.o : %.cpp Makefile
$(CC) $(CFLAGS) $(MESA_DEFS) $(INC_MESA) $(INC_I965) -o $@ $<
/contrib/sdk/sources/Mesa/src/mesa/drivers/dri/i915/i915_texstate.c
47,6 → 47,7
case MESA_FORMAT_I8:
return MAPSURF_8BIT | MT_8BIT_I8;
case MESA_FORMAT_A8:
case MESA_FORMAT_R8:
return MAPSURF_8BIT | MT_8BIT_A8;
case MESA_FORMAT_AL88:
return MAPSURF_16BIT | MT_16BIT_AY88;
/contrib/sdk/sources/Mesa/src/mesa/drivers/dri/i915/intel_context.c
69,6 → 69,7
const struct intel_context *const intel = intel_context(ctx);
const char *chipset;
static char buffer[128];
static char driver_name[] = "i915_dri.drv";
 
switch (name) {
case GL_VENDOR:
88,6 → 89,9
(void) driGetRendererString(buffer, chipset, 0);
return (GLubyte *) buffer;
 
case 0x1F04: /* GL_DRIVER_NAME */
return (GLubyte*)driver_name;
 
default:
return NULL;
}
/contrib/sdk/sources/Mesa/src/mesa/drivers/dri/i915/intel_screen.c
1111,6 → 1111,8
{
struct intel_screen *intelScreen;
 
printf("mesa-9.2.5-i915_dri build %s %s\n", __DATE__, __TIME__);
 
if (psp->dri2.loader->base.version <= 2 ||
psp->dri2.loader->getBuffersWithFormat == NULL) {
fprintf(stderr,