Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 5063 → Rev 5373

/contrib/sdk/sources/Mesa/src/mesa/Makefile
371,13 → 371,59
drivers/dri/i965/gen7_wm_surface_state.c\
$(NULL)
 
I915_SRC = \
drivers/dri/common/dri_util.c \
drivers/dri/common/utils.c \
drivers/dri/common/xmlconfig.c \
drivers/dri/i915/i830_context.c \
drivers/dri/i915/i830_state.c \
drivers/dri/i915/i830_texblend.c \
drivers/dri/i915/i830_texstate.c \
drivers/dri/i915/i830_vtbl.c \
drivers/dri/i915/i915_context.c \
drivers/dri/i915/i915_debug_fp.c \
drivers/dri/i915/i915_fragprog.c \
drivers/dri/i915/i915_program.c \
drivers/dri/i915/i915_state.c \
drivers/dri/i915/i915_tex_layout.c \
drivers/dri/i915/i915_texstate.c \
drivers/dri/i915/i915_vtbl.c \
drivers/dri/i915/intel_batchbuffer.c \
drivers/dri/i915/intel_blit.c \
drivers/dri/i915/intel_buffer_objects.c \
drivers/dri/i915/intel_buffers.c \
drivers/dri/i915/intel_clear.c \
drivers/dri/i915/intel_context.c \
drivers/dri/i915/intel_extensions.c \
drivers/dri/i915/intel_fbo.c \
drivers/dri/i915/intel_mipmap_tree.c \
drivers/dri/i915/intel_pixel.c \
drivers/dri/i915/intel_pixel_bitmap.c \
drivers/dri/i915/intel_pixel_copy.c \
drivers/dri/i915/intel_pixel_draw.c \
drivers/dri/i915/intel_pixel_read.c \
drivers/dri/i915/intel_regions.c \
drivers/dri/i915/intel_render.c \
drivers/dri/i915/intel_screen.c \
drivers/dri/i915/intel_state.c \
drivers/dri/i915/intel_syncobj.c \
drivers/dri/i915/intel_tex.c \
drivers/dri/i915/intel_tex_copy.c \
drivers/dri/i915/intel_tex_image.c \
drivers/dri/i915/intel_tex_layout.c \
drivers/dri/i915/intel_tex_subimage.c \
drivers/dri/i915/intel_tex_validate.c \
drivers/dri/i915/intel_tris.c
 
 
MESA_OBJS = $(patsubst %.c, %.o, $(patsubst %.S, %.o, $(patsubst %.cpp, %.o, $(MAIN_SRC))))
OSMESA_OBJS = $(patsubst %.c, %.o, $(patsubst %.cpp, %.o, $(OSMESA_SRC)))
I965_OBJS = $(patsubst %.c, %.o, $(patsubst %.cpp, %.o, $(I965_SRC)))
I915_OBJS = $(patsubst %.c, %.o, $(patsubst %.cpp, %.o, $(I915_SRC)))
 
# targets
 
all: osmesa.dll i965_dri.drv
all: osmesa.dll i965_dri.drv i915_dri.drv
 
i965_dri.drv: $(I965_OBJS) $(MESA_OBJS) dri.def Makefile
$(LD) $(LDFLAGS) $(LIBPATH) -o $@ $(I965_OBJS) $(MESA_OBJS) dri.def $(LIBS)
384,6 → 430,11
# $(STRIP) $@
mv -f $@ $(SDK_DIR)/bin
 
i915_dri.drv: $(I915_OBJS) $(MESA_OBJS) dri.def Makefile
$(LD) $(LDFLAGS) $(LIBPATH) -o $@ $(I915_OBJS) $(MESA_OBJS) dri.def $(LIBS)
# $(STRIP) $@
mv -f $@ $(SDK_DIR)/bin
 
osmesa.dll: $(MESA_OBJS) $(OSMESA_OBJS) osmesa.def Makefile
$(LD) $(LDFLAGS) $(LIBPATH) --out-implib libosmesa.dll.a -o $@ $(MESA_OBJS) $(OSMESA_OBJS) osmesa.def $(LIBS)
mv -f libosmesa.dll.a $(SDK_DIR)/lib
/contrib/sdk/sources/Mesa/src/mesa/drivers/dri/common/dri_util.c
627,8 → 627,3
assert(fb->Height == dPriv->h);
}
}
 
int atexit(void (*func)(void))
{
return 0;
}
/contrib/sdk/sources/Mesa/src/mesa/drivers/dri/i915/intel_screen.c
769,7 → 769,6
return true;
}
 
 
static bool
intel_get_boolean(__DRIscreen *psp, int param)
{
/contrib/sdk/sources/Mesa/src/mesa/drivers/dri/i965/intel_screen.c
1189,7 → 1189,7
{
struct intel_screen *intelScreen;
 
printf("mesa-9.2.5-i965_dri build %s %s\n", __DATE__, __TIME__);
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) {
/contrib/sdk/sources/Mesa/src/mesa/drivers/osmesa/osmesa.c
1174,8 → 1174,3
#include "glapi/glapitemp.h"
 
#endif /* GLX_INDIRECT_RENDERING */
 
int atexit(void (*func)(void))
{
return 0;
};
/contrib/sdk/sources/Mesa/src/mesa/main/mtypes.h
3647,8 → 3647,8
extern int MESA_DEBUG_FLAGS;
# define MESA_FUNCTION __FUNCTION__
#else
# define ENTER() printf("ENTER %s\n", __FUNCTION__)
# define LEAVE() printf("LEAVE %s\n", __FUNCTION__)
# define ENTER()
# define LEAVE()
# define FAIL()
# define MESA_VERBOSE 0
# define MESA_DEBUG_FLAGS 0