Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 4525 → Rev 4548

/contrib/sdk/sources/Mesa/src/mesa/drivers/dri/common/dri_util.c
627,3 → 627,8
assert(fb->Height == dPriv->h);
}
}
 
int atexit(void (*func)(void))
{
return 0;
}
/contrib/sdk/sources/Mesa/src/mesa/drivers/dri/i915/intel_batchbuffer.c
68,6 → 68,7
drm_intel_bo_unreference(intel->batch.bo);
}
 
#if 0
static void
do_batch_dump(struct intel_context *intel)
{
107,6 → 108,7
intel->vtbl.debug_batch(intel);
}
}
#endif
 
/* TODO: Push this whole function into bufmgr.
*/
127,8 → 129,8
}
}
 
if (unlikely(INTEL_DEBUG & DEBUG_BATCH))
do_batch_dump(intel);
// if (unlikely(INTEL_DEBUG & DEBUG_BATCH))
// do_batch_dump(intel);
 
if (ret != 0) {
fprintf(stderr, "intel_do_flush_locked failed: %s\n", strerror(-ret));
/contrib/sdk/sources/Mesa/src/mesa/drivers/dri/i915/intel_regions.c
39,7 → 39,7
* last moment.
*/
 
#include <sys/ioctl.h>
//#include <sys/ioctl.h>
#include <errno.h>
 
#include "main/hash.h"
205,6 → 205,7
return region;
}
 
#if 0
struct intel_region *
intel_region_alloc_for_fd(struct intel_screen *screen,
GLuint cpp,
237,6 → 238,7
 
return region;
}
#endif
 
void
intel_region_reference(struct intel_region **dst, struct intel_region *src)
/contrib/sdk/sources/Mesa/src/mesa/drivers/dri/i915/intel_screen.c
103,7 → 103,7
{
struct timespec tp;
 
clock_gettime(CLOCK_MONOTONIC, &tp);
// clock_gettime(CLOCK_MONOTONIC, &tp);
 
return tp.tv_sec + tp.tv_nsec / 1000000000.0;
}
528,8 → 528,8
*value = image->planar_format->components;
return true;
case __DRI_IMAGE_ATTRIB_FD:
if (drm_intel_bo_gem_export_to_prime(image->region->bo, value) == 0)
return true;
// if (drm_intel_bo_gem_export_to_prime(image->region->bo, value) == 0)
// return true;
return false;
default:
return false;
620,6 → 620,7
return image;
}
 
#if 0
static __DRIimage *
intel_create_image_from_fds(__DRIscreen *screen,
int width, int height, int fourcc,
664,8 → 665,8
 
return image;
}
#endif
 
 
static __DRIimage *
intel_from_planar(__DRIimage *parent, int plane, void *loaderPrivate)
{
737,7 → 738,7
.createImageFromNames = intel_create_image_from_names,
.fromPlanar = intel_from_planar,
.createImageFromTexture = intel_create_image_from_texture,
.createImageFromFds = intel_create_image_from_fds
// .createImageFromFds = intel_create_image_from_fds
};
 
static const __DRIextension *intelScreenExtensions[] = {
758,7 → 759,7
gp.param = param;
gp.value = value;
 
ret = drmCommandWriteRead(psp->fd, DRM_I915_GETPARAM, &gp, sizeof(gp));
ret = drmIoctl(psp->fd, DRM_IOCTL_I915_GETPARAM, &gp);
if (ret) {
if (ret != -EINVAL)
_mesa_warning(NULL, "drm_i915_getparam: %d", ret);
768,6 → 769,7
return true;
}
 
 
static bool
intel_get_boolean(__DRIscreen *psp, int param)
{
1226,7 → 1228,7
};
 
/* This is the table of extensions that the loader will dlsym() for. */
PUBLIC const __DRIextension *__driDriverExtensions[] = {
__declspec(dllexport) const __DRIextension *__driDriverExtensions[] = {
&driCoreExtension.base,
&driDRI2Extension.base,
NULL