forked from KolibriOS/kolibrios
ffmpeg: update
git-svn-id: svn://kolibrios.org@5601 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Sergey Semyonov (Serge)
parent
c7f0dec3b8
commit
fb406006f7
@ -18,7 +18,7 @@ LIBPATH:= -L../../lib
|
|||||||
|
|
||||||
LIBS:= -ldll -lc.dll
|
LIBS:= -ldll -lc.dll
|
||||||
|
|
||||||
DEFINES:= -DHAS_DEBUG_FULL=0 -DSHOW_BATCH=0 -DDEBUG_DUMP=0
|
DEFINES:= -DNDEBUG -DHAS_DEBUG_FULL=0 -DSHOW_BATCH=0 -DDEBUG_DUMP=0
|
||||||
|
|
||||||
SRC_PIXLIB = pixlib.c
|
SRC_PIXLIB = pixlib.c
|
||||||
|
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -1,727 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright © 2011 Intel Corporation
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
||||||
* copy of this software and associated documentation files (the "Software"),
|
|
||||||
* to deal in the Software without restriction, including without limitation
|
|
||||||
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
||||||
* and/or sell copies of the Software, and to permit persons to whom the
|
|
||||||
* Software is furnished to do so, subject to the following conditions:
|
|
||||||
*
|
|
||||||
* The above copyright notice and this permission notice (including the next
|
|
||||||
* paragraph) shall be included in all copies or substantial portions of the
|
|
||||||
* Software.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
||||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
||||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
||||||
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
|
||||||
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
|
||||||
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
|
||||||
* DEALINGS IN THE SOFTWARE.
|
|
||||||
*
|
|
||||||
* Authors:
|
|
||||||
* Kristian Høgsberg <krh@bitplanet.net>
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <stdint.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <xf86drm.h>
|
|
||||||
#include <dlfcn.h>
|
|
||||||
#include <sys/types.h>
|
|
||||||
#include <sys/stat.h>
|
|
||||||
#include <fcntl.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
|
|
||||||
#include "egl_dri2.h"
|
|
||||||
#include "egl_dri2_fallbacks.h"
|
|
||||||
#include "loader.h"
|
|
||||||
|
|
||||||
static struct gbm_bo *
|
|
||||||
lock_front_buffer(struct gbm_surface *_surf)
|
|
||||||
{
|
|
||||||
struct gbm_dri_surface *surf = (struct gbm_dri_surface *) _surf;
|
|
||||||
struct dri2_egl_surface *dri2_surf = surf->dri_private;
|
|
||||||
struct gbm_dri_device *device = (struct gbm_dri_device *) _surf->gbm;
|
|
||||||
struct gbm_bo *bo;
|
|
||||||
|
|
||||||
if (dri2_surf->current == NULL) {
|
|
||||||
_eglError(EGL_BAD_SURFACE, "no front buffer");
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
bo = dri2_surf->current->bo;
|
|
||||||
|
|
||||||
if (device->dri2) {
|
|
||||||
dri2_surf->current->locked = 1;
|
|
||||||
dri2_surf->current = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
return bo;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
release_buffer(struct gbm_surface *_surf, struct gbm_bo *bo)
|
|
||||||
{
|
|
||||||
struct gbm_dri_surface *surf = (struct gbm_dri_surface *) _surf;
|
|
||||||
struct dri2_egl_surface *dri2_surf = surf->dri_private;
|
|
||||||
int i;
|
|
||||||
|
|
||||||
for (i = 0; i < ARRAY_SIZE(dri2_surf->color_buffers); i++) {
|
|
||||||
if (dri2_surf->color_buffers[i].bo == bo) {
|
|
||||||
dri2_surf->color_buffers[i].locked = 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static int
|
|
||||||
has_free_buffers(struct gbm_surface *_surf)
|
|
||||||
{
|
|
||||||
struct gbm_dri_surface *surf = (struct gbm_dri_surface *) _surf;
|
|
||||||
struct dri2_egl_surface *dri2_surf = surf->dri_private;
|
|
||||||
int i;
|
|
||||||
|
|
||||||
for (i = 0; i < ARRAY_SIZE(dri2_surf->color_buffers); i++)
|
|
||||||
if (!dri2_surf->color_buffers[i].locked)
|
|
||||||
return 1;
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static _EGLSurface *
|
|
||||||
dri2_drm_create_surface(_EGLDriver *drv, _EGLDisplay *disp, EGLint type,
|
|
||||||
_EGLConfig *conf, void *native_window,
|
|
||||||
const EGLint *attrib_list)
|
|
||||||
{
|
|
||||||
struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
|
|
||||||
struct dri2_egl_config *dri2_conf = dri2_egl_config(conf);
|
|
||||||
struct dri2_egl_surface *dri2_surf;
|
|
||||||
struct gbm_surface *window = native_window;
|
|
||||||
struct gbm_dri_surface *surf;
|
|
||||||
|
|
||||||
(void) drv;
|
|
||||||
|
|
||||||
dri2_surf = calloc(1, sizeof *dri2_surf);
|
|
||||||
if (!dri2_surf) {
|
|
||||||
_eglError(EGL_BAD_ALLOC, "dri2_create_surface");
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!_eglInitSurface(&dri2_surf->base, disp, type, conf, attrib_list))
|
|
||||||
goto cleanup_surf;
|
|
||||||
|
|
||||||
switch (type) {
|
|
||||||
case EGL_WINDOW_BIT:
|
|
||||||
if (!window)
|
|
||||||
return NULL;
|
|
||||||
surf = gbm_dri_surface(window);
|
|
||||||
dri2_surf->gbm_surf = surf;
|
|
||||||
dri2_surf->base.Width = surf->base.width;
|
|
||||||
dri2_surf->base.Height = surf->base.height;
|
|
||||||
surf->dri_private = dri2_surf;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
goto cleanup_surf;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (dri2_dpy->dri2) {
|
|
||||||
dri2_surf->dri_drawable =
|
|
||||||
(*dri2_dpy->dri2->createNewDrawable) (dri2_dpy->dri_screen,
|
|
||||||
dri2_conf->dri_double_config,
|
|
||||||
dri2_surf->gbm_surf);
|
|
||||||
|
|
||||||
} else {
|
|
||||||
assert(dri2_dpy->swrast != NULL);
|
|
||||||
dri2_surf->dri_drawable =
|
|
||||||
(*dri2_dpy->swrast->createNewDrawable) (dri2_dpy->dri_screen,
|
|
||||||
dri2_conf->dri_double_config,
|
|
||||||
dri2_surf->gbm_surf);
|
|
||||||
|
|
||||||
}
|
|
||||||
if (dri2_surf->dri_drawable == NULL) {
|
|
||||||
_eglError(EGL_BAD_ALLOC, "createNewDrawable()");
|
|
||||||
goto cleanup_surf;
|
|
||||||
}
|
|
||||||
|
|
||||||
return &dri2_surf->base;
|
|
||||||
|
|
||||||
cleanup_surf:
|
|
||||||
free(dri2_surf);
|
|
||||||
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
static _EGLSurface *
|
|
||||||
dri2_drm_create_window_surface(_EGLDriver *drv, _EGLDisplay *disp,
|
|
||||||
_EGLConfig *conf, void *native_window,
|
|
||||||
const EGLint *attrib_list)
|
|
||||||
{
|
|
||||||
return dri2_drm_create_surface(drv, disp, EGL_WINDOW_BIT, conf,
|
|
||||||
native_window, attrib_list);
|
|
||||||
}
|
|
||||||
|
|
||||||
static _EGLSurface *
|
|
||||||
dri2_drm_create_pixmap_surface(_EGLDriver *drv, _EGLDisplay *disp,
|
|
||||||
_EGLConfig *conf, void *native_window,
|
|
||||||
const EGLint *attrib_list)
|
|
||||||
{
|
|
||||||
/* From the EGL_MESA_platform_gbm spec, version 5:
|
|
||||||
*
|
|
||||||
* It is not valid to call eglCreatePlatformPixmapSurfaceEXT with a <dpy>
|
|
||||||
* that belongs to the GBM platform. Any such call fails and generates
|
|
||||||
* EGL_BAD_PARAMETER.
|
|
||||||
*/
|
|
||||||
_eglError(EGL_BAD_PARAMETER, "cannot create EGL pixmap surfaces on GBM");
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
static EGLBoolean
|
|
||||||
dri2_drm_destroy_surface(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf)
|
|
||||||
{
|
|
||||||
struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
|
|
||||||
struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surf);
|
|
||||||
int i;
|
|
||||||
|
|
||||||
if (!_eglPutSurface(surf))
|
|
||||||
return EGL_TRUE;
|
|
||||||
|
|
||||||
(*dri2_dpy->core->destroyDrawable)(dri2_surf->dri_drawable);
|
|
||||||
|
|
||||||
for (i = 0; i < ARRAY_SIZE(dri2_surf->color_buffers); i++) {
|
|
||||||
if (dri2_surf->color_buffers[i].bo)
|
|
||||||
gbm_bo_destroy(dri2_surf->color_buffers[i].bo);
|
|
||||||
}
|
|
||||||
|
|
||||||
for (i = 0; i < __DRI_BUFFER_COUNT; i++) {
|
|
||||||
if (dri2_surf->dri_buffers[i])
|
|
||||||
dri2_dpy->dri2->releaseBuffer(dri2_dpy->dri_screen,
|
|
||||||
dri2_surf->dri_buffers[i]);
|
|
||||||
}
|
|
||||||
|
|
||||||
free(surf);
|
|
||||||
|
|
||||||
return EGL_TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int
|
|
||||||
get_back_bo(struct dri2_egl_surface *dri2_surf)
|
|
||||||
{
|
|
||||||
struct dri2_egl_display *dri2_dpy =
|
|
||||||
dri2_egl_display(dri2_surf->base.Resource.Display);
|
|
||||||
struct gbm_dri_surface *surf = dri2_surf->gbm_surf;
|
|
||||||
int i;
|
|
||||||
|
|
||||||
if (dri2_surf->back == NULL) {
|
|
||||||
for (i = 0; i < ARRAY_SIZE(dri2_surf->color_buffers); i++) {
|
|
||||||
if (!dri2_surf->color_buffers[i].locked) {
|
|
||||||
dri2_surf->back = &dri2_surf->color_buffers[i];
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (dri2_surf->back == NULL)
|
|
||||||
return -1;
|
|
||||||
if (dri2_surf->back->bo == NULL)
|
|
||||||
dri2_surf->back->bo = gbm_bo_create(&dri2_dpy->gbm_dri->base.base,
|
|
||||||
surf->base.width, surf->base.height,
|
|
||||||
surf->base.format, surf->base.flags);
|
|
||||||
if (dri2_surf->back->bo == NULL)
|
|
||||||
return -1;
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int
|
|
||||||
get_swrast_front_bo(struct dri2_egl_surface *dri2_surf)
|
|
||||||
{
|
|
||||||
struct dri2_egl_display *dri2_dpy =
|
|
||||||
dri2_egl_display(dri2_surf->base.Resource.Display);
|
|
||||||
struct gbm_dri_surface *surf = dri2_surf->gbm_surf;
|
|
||||||
|
|
||||||
if (dri2_surf->current == NULL) {
|
|
||||||
assert(!dri2_surf->color_buffers[0].locked);
|
|
||||||
dri2_surf->current = &dri2_surf->color_buffers[0];
|
|
||||||
}
|
|
||||||
|
|
||||||
if (dri2_surf->current->bo == NULL)
|
|
||||||
dri2_surf->current->bo = gbm_bo_create(&dri2_dpy->gbm_dri->base.base,
|
|
||||||
surf->base.width, surf->base.height,
|
|
||||||
surf->base.format, surf->base.flags);
|
|
||||||
if (dri2_surf->current->bo == NULL)
|
|
||||||
return -1;
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
back_bo_to_dri_buffer(struct dri2_egl_surface *dri2_surf, __DRIbuffer *buffer)
|
|
||||||
{
|
|
||||||
struct dri2_egl_display *dri2_dpy =
|
|
||||||
dri2_egl_display(dri2_surf->base.Resource.Display);
|
|
||||||
struct gbm_dri_bo *bo;
|
|
||||||
int name, pitch;
|
|
||||||
|
|
||||||
bo = (struct gbm_dri_bo *) dri2_surf->back->bo;
|
|
||||||
|
|
||||||
dri2_dpy->image->queryImage(bo->image, __DRI_IMAGE_ATTRIB_NAME, &name);
|
|
||||||
dri2_dpy->image->queryImage(bo->image, __DRI_IMAGE_ATTRIB_STRIDE, &pitch);
|
|
||||||
|
|
||||||
buffer->attachment = __DRI_BUFFER_BACK_LEFT;
|
|
||||||
buffer->name = name;
|
|
||||||
buffer->pitch = pitch;
|
|
||||||
buffer->cpp = 4;
|
|
||||||
buffer->flags = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int
|
|
||||||
get_aux_bo(struct dri2_egl_surface *dri2_surf,
|
|
||||||
unsigned int attachment, unsigned int format, __DRIbuffer *buffer)
|
|
||||||
{
|
|
||||||
struct dri2_egl_display *dri2_dpy =
|
|
||||||
dri2_egl_display(dri2_surf->base.Resource.Display);
|
|
||||||
__DRIbuffer *b = dri2_surf->dri_buffers[attachment];
|
|
||||||
|
|
||||||
if (b == NULL) {
|
|
||||||
b = dri2_dpy->dri2->allocateBuffer(dri2_dpy->dri_screen,
|
|
||||||
attachment, format,
|
|
||||||
dri2_surf->base.Width,
|
|
||||||
dri2_surf->base.Height);
|
|
||||||
dri2_surf->dri_buffers[attachment] = b;
|
|
||||||
}
|
|
||||||
if (b == NULL)
|
|
||||||
return -1;
|
|
||||||
|
|
||||||
memcpy(buffer, b, sizeof *buffer);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static __DRIbuffer *
|
|
||||||
dri2_drm_get_buffers_with_format(__DRIdrawable *driDrawable,
|
|
||||||
int *width, int *height,
|
|
||||||
unsigned int *attachments, int count,
|
|
||||||
int *out_count, void *loaderPrivate)
|
|
||||||
{
|
|
||||||
struct dri2_egl_surface *dri2_surf = loaderPrivate;
|
|
||||||
int i, j;
|
|
||||||
|
|
||||||
dri2_surf->buffer_count = 0;
|
|
||||||
for (i = 0, j = 0; i < 2 * count; i += 2, j++) {
|
|
||||||
assert(attachments[i] < __DRI_BUFFER_COUNT);
|
|
||||||
assert(dri2_surf->buffer_count < 5);
|
|
||||||
|
|
||||||
switch (attachments[i]) {
|
|
||||||
case __DRI_BUFFER_BACK_LEFT:
|
|
||||||
if (get_back_bo(dri2_surf) < 0) {
|
|
||||||
_eglError(EGL_BAD_ALLOC, "failed to allocate color buffer");
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
back_bo_to_dri_buffer(dri2_surf, &dri2_surf->buffers[j]);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
if (get_aux_bo(dri2_surf, attachments[i], attachments[i + 1],
|
|
||||||
&dri2_surf->buffers[j]) < 0) {
|
|
||||||
_eglError(EGL_BAD_ALLOC, "failed to allocate aux buffer");
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
*out_count = j;
|
|
||||||
if (j == 0)
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
*width = dri2_surf->base.Width;
|
|
||||||
*height = dri2_surf->base.Height;
|
|
||||||
|
|
||||||
return dri2_surf->buffers;
|
|
||||||
}
|
|
||||||
|
|
||||||
static __DRIbuffer *
|
|
||||||
dri2_drm_get_buffers(__DRIdrawable * driDrawable,
|
|
||||||
int *width, int *height,
|
|
||||||
unsigned int *attachments, int count,
|
|
||||||
int *out_count, void *loaderPrivate)
|
|
||||||
{
|
|
||||||
unsigned int *attachments_with_format;
|
|
||||||
__DRIbuffer *buffer;
|
|
||||||
const unsigned int format = 32;
|
|
||||||
int i;
|
|
||||||
|
|
||||||
attachments_with_format = calloc(count, 2 * sizeof(unsigned int));
|
|
||||||
if (!attachments_with_format) {
|
|
||||||
*out_count = 0;
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (i = 0; i < count; ++i) {
|
|
||||||
attachments_with_format[2*i] = attachments[i];
|
|
||||||
attachments_with_format[2*i + 1] = format;
|
|
||||||
}
|
|
||||||
|
|
||||||
buffer =
|
|
||||||
dri2_drm_get_buffers_with_format(driDrawable,
|
|
||||||
width, height,
|
|
||||||
attachments_with_format, count,
|
|
||||||
out_count, loaderPrivate);
|
|
||||||
|
|
||||||
free(attachments_with_format);
|
|
||||||
|
|
||||||
return buffer;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int
|
|
||||||
dri2_drm_image_get_buffers(__DRIdrawable *driDrawable,
|
|
||||||
unsigned int format,
|
|
||||||
uint32_t *stamp,
|
|
||||||
void *loaderPrivate,
|
|
||||||
uint32_t buffer_mask,
|
|
||||||
struct __DRIimageList *buffers)
|
|
||||||
{
|
|
||||||
struct dri2_egl_surface *dri2_surf = loaderPrivate;
|
|
||||||
struct gbm_dri_bo *bo;
|
|
||||||
|
|
||||||
if (get_back_bo(dri2_surf) < 0)
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
bo = (struct gbm_dri_bo *) dri2_surf->back->bo;
|
|
||||||
buffers->image_mask = __DRI_IMAGE_BUFFER_BACK;
|
|
||||||
buffers->back = bo->image;
|
|
||||||
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
dri2_drm_flush_front_buffer(__DRIdrawable * driDrawable, void *loaderPrivate)
|
|
||||||
{
|
|
||||||
(void) driDrawable;
|
|
||||||
(void) loaderPrivate;
|
|
||||||
}
|
|
||||||
|
|
||||||
static EGLBoolean
|
|
||||||
dri2_drm_swap_buffers(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *draw)
|
|
||||||
{
|
|
||||||
struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
|
|
||||||
struct dri2_egl_surface *dri2_surf = dri2_egl_surface(draw);
|
|
||||||
int i;
|
|
||||||
|
|
||||||
if (dri2_dpy->swrast) {
|
|
||||||
(*dri2_dpy->core->swapBuffers)(dri2_surf->dri_drawable);
|
|
||||||
} else {
|
|
||||||
if (dri2_surf->base.Type == EGL_WINDOW_BIT) {
|
|
||||||
if (dri2_surf->current)
|
|
||||||
_eglError(EGL_BAD_SURFACE, "dri2_swap_buffers");
|
|
||||||
for (i = 0; i < ARRAY_SIZE(dri2_surf->color_buffers); i++)
|
|
||||||
if (dri2_surf->color_buffers[i].age > 0)
|
|
||||||
dri2_surf->color_buffers[i].age++;
|
|
||||||
|
|
||||||
/* Make sure we have a back buffer in case we're swapping without
|
|
||||||
* ever rendering. */
|
|
||||||
if (get_back_bo(dri2_surf) < 0) {
|
|
||||||
_eglError(EGL_BAD_ALLOC, "dri2_swap_buffers");
|
|
||||||
return EGL_FALSE;
|
|
||||||
}
|
|
||||||
|
|
||||||
dri2_surf->current = dri2_surf->back;
|
|
||||||
dri2_surf->current->age = 1;
|
|
||||||
dri2_surf->back = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
dri2_flush_drawable_for_swapbuffers(disp, draw);
|
|
||||||
(*dri2_dpy->flush->invalidate)(dri2_surf->dri_drawable);
|
|
||||||
}
|
|
||||||
|
|
||||||
return EGL_TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
static EGLint
|
|
||||||
dri2_drm_query_buffer_age(_EGLDriver *drv,
|
|
||||||
_EGLDisplay *disp, _EGLSurface *surface)
|
|
||||||
{
|
|
||||||
struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surface);
|
|
||||||
|
|
||||||
if (get_back_bo(dri2_surf) < 0) {
|
|
||||||
_eglError(EGL_BAD_ALLOC, "dri2_query_buffer_age");
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
return dri2_surf->back->age;
|
|
||||||
}
|
|
||||||
|
|
||||||
static _EGLImage *
|
|
||||||
dri2_drm_create_image_khr_pixmap(_EGLDisplay *disp, _EGLContext *ctx,
|
|
||||||
EGLClientBuffer buffer, const EGLint *attr_list)
|
|
||||||
{
|
|
||||||
struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
|
|
||||||
struct gbm_dri_bo *dri_bo = gbm_dri_bo((struct gbm_bo *) buffer);
|
|
||||||
struct dri2_egl_image *dri2_img;
|
|
||||||
|
|
||||||
dri2_img = malloc(sizeof *dri2_img);
|
|
||||||
if (!dri2_img) {
|
|
||||||
_eglError(EGL_BAD_ALLOC, "dri2_create_image_khr_pixmap");
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!_eglInitImage(&dri2_img->base, disp)) {
|
|
||||||
free(dri2_img);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
dri2_img->dri_image = dri2_dpy->image->dupImage(dri_bo->image, dri2_img);
|
|
||||||
if (dri2_img->dri_image == NULL) {
|
|
||||||
free(dri2_img);
|
|
||||||
_eglError(EGL_BAD_ALLOC, "dri2_create_image_khr_pixmap");
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
return &dri2_img->base;
|
|
||||||
}
|
|
||||||
|
|
||||||
static _EGLImage *
|
|
||||||
dri2_drm_create_image_khr(_EGLDriver *drv, _EGLDisplay *disp,
|
|
||||||
_EGLContext *ctx, EGLenum target,
|
|
||||||
EGLClientBuffer buffer, const EGLint *attr_list)
|
|
||||||
{
|
|
||||||
(void) drv;
|
|
||||||
|
|
||||||
switch (target) {
|
|
||||||
case EGL_NATIVE_PIXMAP_KHR:
|
|
||||||
return dri2_drm_create_image_khr_pixmap(disp, ctx, buffer, attr_list);
|
|
||||||
default:
|
|
||||||
return dri2_create_image_khr(drv, disp, ctx, target, buffer, attr_list);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#if 0
|
|
||||||
static int
|
|
||||||
dri2_drm_authenticate(_EGLDisplay *disp, uint32_t id)
|
|
||||||
{
|
|
||||||
struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
|
|
||||||
|
|
||||||
return drmAuthMagic(dri2_dpy->fd, id);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static void
|
|
||||||
swrast_put_image2(__DRIdrawable *driDrawable,
|
|
||||||
int op,
|
|
||||||
int x,
|
|
||||||
int y,
|
|
||||||
int width,
|
|
||||||
int height,
|
|
||||||
int stride,
|
|
||||||
char *data,
|
|
||||||
void *loaderPrivate)
|
|
||||||
{
|
|
||||||
struct dri2_egl_surface *dri2_surf = loaderPrivate;
|
|
||||||
int internal_stride, i;
|
|
||||||
struct gbm_dri_bo *bo;
|
|
||||||
|
|
||||||
if (op != __DRI_SWRAST_IMAGE_OP_DRAW &&
|
|
||||||
op != __DRI_SWRAST_IMAGE_OP_SWAP)
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (get_swrast_front_bo(dri2_surf) < 0)
|
|
||||||
return;
|
|
||||||
|
|
||||||
bo = gbm_dri_bo(dri2_surf->current->bo);
|
|
||||||
if (gbm_dri_bo_map(bo) == NULL)
|
|
||||||
return;
|
|
||||||
|
|
||||||
internal_stride = bo->base.base.stride;
|
|
||||||
|
|
||||||
for (i = 0; i < height; i++) {
|
|
||||||
memcpy(bo->map + (x + i) * internal_stride + y,
|
|
||||||
data + i * stride, stride);
|
|
||||||
}
|
|
||||||
|
|
||||||
gbm_dri_bo_unmap(bo);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
swrast_get_image(__DRIdrawable *driDrawable,
|
|
||||||
int x,
|
|
||||||
int y,
|
|
||||||
int width,
|
|
||||||
int height,
|
|
||||||
char *data,
|
|
||||||
void *loaderPrivate)
|
|
||||||
{
|
|
||||||
struct dri2_egl_surface *dri2_surf = loaderPrivate;
|
|
||||||
int internal_stride, stride, i;
|
|
||||||
struct gbm_dri_bo *bo;
|
|
||||||
|
|
||||||
if (get_swrast_front_bo(dri2_surf) < 0)
|
|
||||||
return;
|
|
||||||
|
|
||||||
bo = gbm_dri_bo(dri2_surf->current->bo);
|
|
||||||
if (gbm_dri_bo_map(bo) == NULL)
|
|
||||||
return;
|
|
||||||
|
|
||||||
internal_stride = bo->base.base.stride;
|
|
||||||
stride = width * 4;
|
|
||||||
|
|
||||||
for (i = 0; i < height; i++) {
|
|
||||||
memcpy(data + i * stride,
|
|
||||||
bo->map + (x + i) * internal_stride + y, stride);
|
|
||||||
}
|
|
||||||
|
|
||||||
gbm_dri_bo_unmap(bo);
|
|
||||||
}
|
|
||||||
|
|
||||||
static struct dri2_egl_display_vtbl dri2_drm_display_vtbl = {
|
|
||||||
.authenticate = dri2_drm_authenticate,
|
|
||||||
.create_window_surface = dri2_drm_create_window_surface,
|
|
||||||
.create_pixmap_surface = dri2_drm_create_pixmap_surface,
|
|
||||||
.create_pbuffer_surface = dri2_fallback_create_pbuffer_surface,
|
|
||||||
.destroy_surface = dri2_drm_destroy_surface,
|
|
||||||
.create_image = dri2_drm_create_image_khr,
|
|
||||||
.swap_interval = dri2_fallback_swap_interval,
|
|
||||||
.swap_buffers = dri2_drm_swap_buffers,
|
|
||||||
.swap_buffers_with_damage = dri2_fallback_swap_buffers_with_damage,
|
|
||||||
.swap_buffers_region = dri2_fallback_swap_buffers_region,
|
|
||||||
.post_sub_buffer = dri2_fallback_post_sub_buffer,
|
|
||||||
.copy_buffers = dri2_fallback_copy_buffers,
|
|
||||||
.query_buffer_age = dri2_drm_query_buffer_age,
|
|
||||||
.create_wayland_buffer_from_image = dri2_fallback_create_wayland_buffer_from_image,
|
|
||||||
.get_sync_values = dri2_fallback_get_sync_values,
|
|
||||||
};
|
|
||||||
|
|
||||||
EGLBoolean
|
|
||||||
dri2_initialize_drm(_EGLDriver *drv, _EGLDisplay *disp)
|
|
||||||
{
|
|
||||||
struct dri2_egl_display *dri2_dpy;
|
|
||||||
struct gbm_device *gbm;
|
|
||||||
void *lib;
|
|
||||||
|
|
||||||
int fd = -1;
|
|
||||||
int i;
|
|
||||||
|
|
||||||
loader_set_logger(_eglLog);
|
|
||||||
|
|
||||||
dri2_dpy = calloc(1, sizeof *dri2_dpy);
|
|
||||||
if (!dri2_dpy)
|
|
||||||
return _eglError(EGL_BAD_ALLOC, "eglInitialize");
|
|
||||||
|
|
||||||
disp->DriverData = (void *) dri2_dpy;
|
|
||||||
|
|
||||||
gbm = disp->PlatformDisplay;
|
|
||||||
if (gbm == NULL) {
|
|
||||||
fd = get_service("DISPLAY");
|
|
||||||
dri2_dpy->own_device = 1;
|
|
||||||
gbm = gbm_create_device(fd);
|
|
||||||
if (gbm == NULL)
|
|
||||||
return EGL_FALSE;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (strcmp(gbm_device_get_backend_name(gbm), "drm") != 0) {
|
|
||||||
free(dri2_dpy);
|
|
||||||
return EGL_FALSE;
|
|
||||||
}
|
|
||||||
|
|
||||||
dri2_dpy->gbm_dri = gbm_dri_device(gbm);
|
|
||||||
if (dri2_dpy->gbm_dri->base.type != GBM_DRM_DRIVER_TYPE_DRI) {
|
|
||||||
free(dri2_dpy);
|
|
||||||
return EGL_FALSE;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (fd < 0) {
|
|
||||||
fd = dup(gbm_device_get_fd(gbm));
|
|
||||||
if (fd < 0) {
|
|
||||||
free(dri2_dpy);
|
|
||||||
return EGL_FALSE;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
dri2_dpy->fd = fd;
|
|
||||||
dri2_dpy->device_name = loader_get_device_name_for_fd(dri2_dpy->fd);
|
|
||||||
dri2_dpy->driver_name = strdup(dri2_dpy->gbm_dri->base.driver_name);
|
|
||||||
|
|
||||||
dri2_dpy->dri_screen = dri2_dpy->gbm_dri->screen;
|
|
||||||
dri2_dpy->core = dri2_dpy->gbm_dri->core;
|
|
||||||
dri2_dpy->dri2 = dri2_dpy->gbm_dri->dri2;
|
|
||||||
dri2_dpy->image = dri2_dpy->gbm_dri->image;
|
|
||||||
dri2_dpy->flush = dri2_dpy->gbm_dri->flush;
|
|
||||||
dri2_dpy->swrast = dri2_dpy->gbm_dri->swrast;
|
|
||||||
dri2_dpy->driver_configs = dri2_dpy->gbm_dri->driver_configs;
|
|
||||||
|
|
||||||
dri2_dpy->gbm_dri->lookup_image = dri2_lookup_egl_image;
|
|
||||||
dri2_dpy->gbm_dri->lookup_user_data = disp;
|
|
||||||
|
|
||||||
dri2_dpy->gbm_dri->get_buffers = dri2_drm_get_buffers;
|
|
||||||
dri2_dpy->gbm_dri->flush_front_buffer = dri2_drm_flush_front_buffer;
|
|
||||||
dri2_dpy->gbm_dri->get_buffers_with_format = dri2_drm_get_buffers_with_format;
|
|
||||||
dri2_dpy->gbm_dri->image_get_buffers = dri2_drm_image_get_buffers;
|
|
||||||
dri2_dpy->gbm_dri->swrast_put_image2 = swrast_put_image2;
|
|
||||||
dri2_dpy->gbm_dri->swrast_get_image = swrast_get_image;
|
|
||||||
|
|
||||||
dri2_dpy->gbm_dri->base.base.surface_lock_front_buffer = lock_front_buffer;
|
|
||||||
dri2_dpy->gbm_dri->base.base.surface_release_buffer = release_buffer;
|
|
||||||
dri2_dpy->gbm_dri->base.base.surface_has_free_buffers = has_free_buffers;
|
|
||||||
|
|
||||||
dri2_setup_screen(disp);
|
|
||||||
|
|
||||||
for (i = 0; dri2_dpy->driver_configs[i]; i++) {
|
|
||||||
EGLint format, attr_list[3];
|
|
||||||
unsigned int red, alpha;
|
|
||||||
|
|
||||||
dri2_dpy->core->getConfigAttrib(dri2_dpy->driver_configs[i],
|
|
||||||
__DRI_ATTRIB_RED_MASK, &red);
|
|
||||||
dri2_dpy->core->getConfigAttrib(dri2_dpy->driver_configs[i],
|
|
||||||
__DRI_ATTRIB_ALPHA_MASK, &alpha);
|
|
||||||
if (red == 0x3ff00000 && alpha == 0x00000000)
|
|
||||||
format = GBM_FORMAT_XRGB2101010;
|
|
||||||
else if (red == 0x3ff00000 && alpha == 0xc0000000)
|
|
||||||
format = GBM_FORMAT_ARGB2101010;
|
|
||||||
else if (red == 0x00ff0000 && alpha == 0x00000000)
|
|
||||||
format = GBM_FORMAT_XRGB8888;
|
|
||||||
else if (red == 0x00ff0000 && alpha == 0xff000000)
|
|
||||||
format = GBM_FORMAT_ARGB8888;
|
|
||||||
else if (red == 0xf800)
|
|
||||||
format = GBM_FORMAT_RGB565;
|
|
||||||
else
|
|
||||||
continue;
|
|
||||||
|
|
||||||
attr_list[0] = EGL_NATIVE_VISUAL_ID;
|
|
||||||
attr_list[1] = format;
|
|
||||||
attr_list[2] = EGL_NONE;
|
|
||||||
|
|
||||||
dri2_add_config(disp, dri2_dpy->driver_configs[i],
|
|
||||||
i + 1, EGL_WINDOW_BIT, attr_list, NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
disp->Extensions.KHR_image_pixmap = EGL_TRUE;
|
|
||||||
if (dri2_dpy->dri2)
|
|
||||||
disp->Extensions.EXT_buffer_age = EGL_TRUE;
|
|
||||||
|
|
||||||
#ifdef HAVE_WAYLAND_PLATFORM
|
|
||||||
if (dri2_dpy->image) {
|
|
||||||
if (dri2_dpy->image->base.version >= 10 &&
|
|
||||||
dri2_dpy->image->getCapabilities != NULL) {
|
|
||||||
int capabilities;
|
|
||||||
|
|
||||||
capabilities =
|
|
||||||
dri2_dpy->image->getCapabilities(dri2_dpy->dri_screen);
|
|
||||||
disp->Extensions.WL_bind_wayland_display =
|
|
||||||
(capabilities & __DRI_IMAGE_CAP_GLOBAL_NAMES) != 0;
|
|
||||||
} else
|
|
||||||
disp->Extensions.WL_bind_wayland_display = EGL_TRUE;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* we're supporting EGL 1.4 */
|
|
||||||
disp->VersionMajor = 1;
|
|
||||||
disp->VersionMinor = 4;
|
|
||||||
|
|
||||||
/* Fill vtbl last to prevent accidentally calling virtual function during
|
|
||||||
* initialization.
|
|
||||||
*/
|
|
||||||
dri2_dpy->vtbl = &dri2_drm_display_vtbl;
|
|
||||||
|
|
||||||
return EGL_TRUE;
|
|
||||||
}
|
|
||||||
@ -1,193 +0,0 @@
|
|||||||
/*
|
|
||||||
* Mesa 3-D graphics library
|
|
||||||
*
|
|
||||||
* Copyright (C) 1999-2008 Brian Paul All Rights Reserved.
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
||||||
* copy of this software and associated documentation files (the "Software"),
|
|
||||||
* to deal in the Software without restriction, including without limitation
|
|
||||||
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
||||||
* and/or sell copies of the Software, and to permit persons to whom the
|
|
||||||
* Software is furnished to do so, subject to the following conditions:
|
|
||||||
*
|
|
||||||
* The above copyright notice and this permission notice shall be included
|
|
||||||
* in all copies or substantial portions of the Software.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
|
||||||
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
||||||
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
|
||||||
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
|
||||||
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
||||||
* OTHER DEALINGS IN THE SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* \mainpage Mesa GL API Module
|
|
||||||
*
|
|
||||||
* \section GLAPIIntroduction Introduction
|
|
||||||
*
|
|
||||||
* The Mesa GL API module is responsible for dispatching all the
|
|
||||||
* gl*() functions. All GL functions are dispatched by jumping through
|
|
||||||
* the current dispatch table (basically a struct full of function
|
|
||||||
* pointers.)
|
|
||||||
*
|
|
||||||
* A per-thread current dispatch table and per-thread current context
|
|
||||||
* pointer are managed by this module too.
|
|
||||||
*
|
|
||||||
* This module is intended to be non-Mesa-specific so it can be used
|
|
||||||
* with the X/DRI libGL also.
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
#ifndef _GLAPI_H
|
|
||||||
#define _GLAPI_H
|
|
||||||
|
|
||||||
#include "util/macros.h"
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef _GLAPI_NO_EXPORTS
|
|
||||||
# define _GLAPI_EXPORT
|
|
||||||
#else /* _GLAPI_NO_EXPORTS */
|
|
||||||
# ifdef _WIN32
|
|
||||||
# ifdef _GLAPI_DLL_EXPORTS
|
|
||||||
# define _GLAPI_EXPORT __declspec(dllexport)
|
|
||||||
# else
|
|
||||||
# define _GLAPI_EXPORT __declspec(dllimport)
|
|
||||||
# endif
|
|
||||||
# elif defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
|
|
||||||
# define _GLAPI_EXPORT __attribute__((visibility("default")))
|
|
||||||
# else
|
|
||||||
# define _GLAPI_EXPORT
|
|
||||||
# endif
|
|
||||||
#endif /* _GLAPI_NO_EXPORTS */
|
|
||||||
|
|
||||||
|
|
||||||
/* Is this needed? It is incomplete anyway. */
|
|
||||||
#ifdef USE_MGL_NAMESPACE
|
|
||||||
#define _glapi_set_dispatch _mglapi_set_dispatch
|
|
||||||
#define _glapi_get_dispatch _mglapi_get_dispatch
|
|
||||||
#define _glapi_set_context _mglapi_set_context
|
|
||||||
#define _glapi_get_context _mglapi_get_context
|
|
||||||
#define _glapi_Dispatch _mglapi_Dispatch
|
|
||||||
#define _glapi_Context _mglapi_Context
|
|
||||||
#endif
|
|
||||||
|
|
||||||
typedef void (*_glapi_proc)(void);
|
|
||||||
|
|
||||||
typedef void (*_glapi_nop_handler_proc)(const char *name);
|
|
||||||
|
|
||||||
struct _glapi_table;
|
|
||||||
|
|
||||||
|
|
||||||
#if defined (GLX_USE_TLS)
|
|
||||||
|
|
||||||
_GLAPI_EXPORT extern __thread struct _glapi_table * _glapi_tls_Dispatch
|
|
||||||
__attribute__((tls_model("initial-exec")));
|
|
||||||
|
|
||||||
_GLAPI_EXPORT extern __thread void * _glapi_tls_Context
|
|
||||||
__attribute__((tls_model("initial-exec")));
|
|
||||||
|
|
||||||
_GLAPI_EXPORT extern const struct _glapi_table *_glapi_Dispatch;
|
|
||||||
_GLAPI_EXPORT extern const void *_glapi_Context;
|
|
||||||
|
|
||||||
# define GET_DISPATCH() _glapi_tls_Dispatch
|
|
||||||
# define GET_CURRENT_CONTEXT(C) struct gl_context *C = (struct gl_context *) _glapi_tls_Context
|
|
||||||
|
|
||||||
#else
|
|
||||||
|
|
||||||
_GLAPI_EXPORT extern struct _glapi_table *_glapi_Dispatch;
|
|
||||||
_GLAPI_EXPORT extern void *_glapi_Context;
|
|
||||||
|
|
||||||
#define GET_DISPATCH() \
|
|
||||||
(likely(_glapi_Dispatch) ? _glapi_Dispatch : _glapi_get_dispatch())
|
|
||||||
|
|
||||||
#define GET_CURRENT_CONTEXT(C) struct gl_context *C = (struct gl_context *) \
|
|
||||||
(likely(_glapi_Context) ? _glapi_Context : _glapi_get_context())
|
|
||||||
|
|
||||||
#endif /* defined (GLX_USE_TLS) */
|
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
_glapi_destroy_multithread(void);
|
|
||||||
|
|
||||||
|
|
||||||
_GLAPI_EXPORT void
|
|
||||||
_glapi_check_multithread(void);
|
|
||||||
|
|
||||||
|
|
||||||
_GLAPI_EXPORT void
|
|
||||||
_glapi_set_context(void *context);
|
|
||||||
|
|
||||||
|
|
||||||
_GLAPI_EXPORT void *
|
|
||||||
_glapi_get_context(void);
|
|
||||||
|
|
||||||
|
|
||||||
_GLAPI_EXPORT void
|
|
||||||
_glapi_set_dispatch(struct _glapi_table *dispatch);
|
|
||||||
|
|
||||||
|
|
||||||
_GLAPI_EXPORT struct _glapi_table *
|
|
||||||
_glapi_get_dispatch(void);
|
|
||||||
|
|
||||||
|
|
||||||
_GLAPI_EXPORT unsigned int
|
|
||||||
_glapi_get_dispatch_table_size(void);
|
|
||||||
|
|
||||||
|
|
||||||
_GLAPI_EXPORT int
|
|
||||||
_glapi_add_dispatch( const char * const * function_names,
|
|
||||||
const char * parameter_signature );
|
|
||||||
|
|
||||||
_GLAPI_EXPORT int
|
|
||||||
_glapi_get_proc_offset(const char *funcName);
|
|
||||||
|
|
||||||
|
|
||||||
_GLAPI_EXPORT _glapi_proc
|
|
||||||
_glapi_get_proc_address(const char *funcName);
|
|
||||||
|
|
||||||
|
|
||||||
_GLAPI_EXPORT const char *
|
|
||||||
_glapi_get_proc_name(unsigned int offset);
|
|
||||||
|
|
||||||
|
|
||||||
_GLAPI_EXPORT struct _glapi_table *
|
|
||||||
_glapi_create_table_from_handle(void *handle, const char *symbol_prefix);
|
|
||||||
|
|
||||||
|
|
||||||
_GLAPI_EXPORT void
|
|
||||||
_glapi_set_nop_handler(_glapi_nop_handler_proc func);
|
|
||||||
|
|
||||||
/** Return pointer to new dispatch table filled with no-op functions */
|
|
||||||
_GLAPI_EXPORT struct _glapi_table *
|
|
||||||
_glapi_new_nop_table(unsigned num_entries);
|
|
||||||
|
|
||||||
|
|
||||||
/** Deprecated function */
|
|
||||||
_GLAPI_EXPORT unsigned long
|
|
||||||
_glthread_GetID(void);
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
* These stubs are kept so that the old DRI drivers still load.
|
|
||||||
*/
|
|
||||||
_GLAPI_EXPORT void
|
|
||||||
_glapi_noop_enable_warnings(unsigned char enable);
|
|
||||||
|
|
||||||
|
|
||||||
_GLAPI_EXPORT void
|
|
||||||
_glapi_set_warning_func(_glapi_proc func);
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* _GLAPI_H */
|
|
||||||
@ -71,7 +71,7 @@ CC_DEPFLAGS=-MMD -MF $(@:.o=.d) -MT $@
|
|||||||
AS_DEPFLAGS=-MMD -MF $(@:.o=.d) -MT $@
|
AS_DEPFLAGS=-MMD -MF $(@:.o=.d) -MT $@
|
||||||
HOSTCC=gcc
|
HOSTCC=gcc
|
||||||
HOSTLD=gcc
|
HOSTLD=gcc
|
||||||
HOSTCFLAGS=-O2 -g -std=c99 -Wall
|
HOSTCFLAGS=-O2 -std=c99 -Wall
|
||||||
HOSTCPPFLAGS=-D_ISOC99_SOURCE -D_XOPEN_SOURCE=600
|
HOSTCPPFLAGS=-D_ISOC99_SOURCE -D_XOPEN_SOURCE=600
|
||||||
HOSTEXESUF=.exe
|
HOSTEXESUF=.exe
|
||||||
HOSTLDFLAGS=
|
HOSTLDFLAGS=
|
||||||
|
|||||||
@ -30,6 +30,11 @@
|
|||||||
* @{
|
* @{
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#define ENTER() printf("enter %s\n",__FUNCTION__)
|
||||||
|
#define LEAVE() printf("leave %s\n",__FUNCTION__)
|
||||||
|
#define FAIL() printf("fail %s\n",__FUNCTION__)
|
||||||
|
|
||||||
|
|
||||||
static void destroy_buffers(VADisplay display, VABufferID *buffers, unsigned int n_buffers)
|
static void destroy_buffers(VADisplay display, VABufferID *buffers, unsigned int n_buffers)
|
||||||
{
|
{
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
@ -152,7 +157,7 @@ VASliceParameterBufferBase *ff_vaapi_alloc_slice(struct vaapi_context *vactx, co
|
|||||||
{
|
{
|
||||||
uint8_t *slice_params;
|
uint8_t *slice_params;
|
||||||
VASliceParameterBufferBase *slice_param;
|
VASliceParameterBufferBase *slice_param;
|
||||||
|
ENTER();
|
||||||
if (!vactx->slice_data)
|
if (!vactx->slice_data)
|
||||||
vactx->slice_data = buffer;
|
vactx->slice_data = buffer;
|
||||||
if (vactx->slice_data + vactx->slice_data_size != buffer) {
|
if (vactx->slice_data + vactx->slice_data_size != buffer) {
|
||||||
@ -176,6 +181,7 @@ VASliceParameterBufferBase *ff_vaapi_alloc_slice(struct vaapi_context *vactx, co
|
|||||||
|
|
||||||
vactx->slice_count++;
|
vactx->slice_count++;
|
||||||
vactx->slice_data_size += size;
|
vactx->slice_data_size += size;
|
||||||
|
LEAVE();
|
||||||
return slice_param;
|
return slice_param;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -5,7 +5,8 @@ AR = kos32-ar
|
|||||||
LD = kos32-ld
|
LD = kos32-ld
|
||||||
STRIP = kos32-strip
|
STRIP = kos32-strip
|
||||||
|
|
||||||
CFLAGS = -U_Win32 -U_WIN32 -U__MINGW32__ -c -O2 -Wall -Winline -fno-ident -fomit-frame-pointer
|
CFLAGS = -U_Win32 -U_WIN32 -U__MINGW32__ -c -O2 -Wall -Winline -fno-ident
|
||||||
|
CFLAGS+= -mno-ms-bitfields -fomit-frame-pointer
|
||||||
|
|
||||||
LDFLAGS = -shared -s -nostdlib -T ../../newlib/dll.lds --entry _DllStartup --image-base=0
|
LDFLAGS = -shared -s -nostdlib -T ../../newlib/dll.lds --entry _DllStartup --image-base=0
|
||||||
LDFLAGS+= --version-script i965-video.ver --out-implib lib$(LIBRARY).dll.a
|
LDFLAGS+= --version-script i965-video.ver --out-implib lib$(LIBRARY).dll.a
|
||||||
|
|||||||
@ -5,7 +5,8 @@ AR = kos32-ar
|
|||||||
LD = kos32-ld
|
LD = kos32-ld
|
||||||
STRIP = kos32-strip
|
STRIP = kos32-strip
|
||||||
|
|
||||||
CFLAGS = -U_Win32 -U_WIN32 -U__MINGW32__ -c -O2 -Wall -Winline -fno-ident -fomit-frame-pointer
|
CFLAGS = -U_Win32 -U_WIN32 -U__MINGW32__ -c -O2 -Wall -Winline -fno-ident
|
||||||
|
CFLAGS+= -mno-ms-bitfields -fomit-frame-pointer
|
||||||
|
|
||||||
LDFLAGS = -shared -s -nostdlib -T ../../newlib/dll.lds --entry _DllStartup --image-base=0
|
LDFLAGS = -shared -s -nostdlib -T ../../newlib/dll.lds --entry _DllStartup --image-base=0
|
||||||
LDFLAGS+= --out-implib $(LIBRARY).dll.a
|
LDFLAGS+= --out-implib $(LIBRARY).dll.a
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user