From 6ac1bbe21a978e326e6361426343b61d10140aa3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Thomas=20Balling=20S=C3=B8rensen?= Date: Tue, 26 Oct 2010 13:44:19 +0200 Subject: [PATCH] =?utf8?q?vl:=20pipe-video=20branch=20merged=20with=20K?= =?utf8?q?=C3=B6nigs=20pipe-video=20branch?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- configure.ac | 25 ++----------- .../drivers/softpipe/sp_video_context.c | 37 ++++--------------- src/gallium/include/pipe/p_defines.h | 10 ----- src/gallium/include/pipe/p_format.h | 6 +-- src/gallium/include/pipe/p_screen.h | 8 ---- 5 files changed, 14 insertions(+), 72 deletions(-) diff --git a/configure.ac b/configure.ac index c9daffbb3ae..5edd935920d 100644 --- a/configure.ac +++ b/configure.ac @@ -1486,11 +1486,7 @@ dnl dnl Gallium helper functions dnl gallium_check_st() { -<<<<<<< HEAD - if test "x$HAVE_ST_DRI" = xyes || test "x$HAVE_ST_EGL" = xyes || test "x$HAVE_ST_XORG" = xyes || test "x$HAVE_ST_XVMC" = xyes || test "x$HAVE_ST_VDPAU" = xyes || test "x$HAVE_ST_VA" = xyes; then -======= - if test "x$HAVE_ST_DRI" = xyes || test "x$HAVE_ST_XORG" = xyes || test "x$HAVE_ST_XVMC" = xyes; then ->>>>>>> 97a7cf230a70c64fff300931ae7c00aa00449c97 + if test "x$HAVE_ST_DRI" = xyes || test "x$HAVE_ST_XORG" = xyes || test "x$HAVE_ST_XVMC" = xyes || test "x$HAVE_ST_VDPAU" = xyes || test "x$HAVE_ST_VA" = xyes; then GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS $1" fi if test "x$HAVE_ST_DRI" = xyes && test "x$2" != x; then @@ -1499,24 +1495,15 @@ gallium_check_st() { if test "x$HAVE_ST_XORG" = xyes && test "x$3" != x; then GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $3" fi -<<<<<<< HEAD - if test "x$HAVE_ST_XORG" = xyes && test "x$4" != x; then + if test "x$HAVE_ST_XVMC" = xyes && test "x$4" != x; then GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $4" fi - if test "x$HAVE_ST_XVMC" = xyes && test "x$5" != x; then + if test "x$HAVE_ST_VDPAU" = xyes && test "x$5" != x; then GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $5" fi - if test "x$HAVE_ST_VDPAU" = xyes && test "x$6" != x; then + if test "x$HAVE_ST_VA" = xyes && test "x$6" != x; then GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $6" fi - if test "x$HAVE_ST_VA" = xyes && test "x$7" != x; then - GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $7" - fi -======= - if test "x$HAVE_ST_XVMC" = xyes && test "x$5" != x; then - GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $5" - fi ->>>>>>> 97a7cf230a70c64fff300931ae7c00aa00449c97 } @@ -1619,11 +1606,7 @@ AC_ARG_ENABLE([gallium-nouveau], [enable_gallium_nouveau=no]) if test "x$enable_gallium_nouveau" = xyes; then GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS nouveau nvfx nv50" -<<<<<<< HEAD - gallium_check_st "nouveau/drm" "dri-nouveau" "egl-nouveau" "xorg-nouveau" "xvmc-nouveau" -======= gallium_check_st "nouveau/drm" "dri-nouveau" "xorg-nouveau" "xvmc-nouveau" ->>>>>>> 97a7cf230a70c64fff300931ae7c00aa00449c97 fi dnl diff --git a/src/gallium/drivers/softpipe/sp_video_context.c b/src/gallium/drivers/softpipe/sp_video_context.c index f39c46e596c..9acf7171e5a 100644 --- a/src/gallium/drivers/softpipe/sp_video_context.c +++ b/src/gallium/drivers/softpipe/sp_video_context.c @@ -98,13 +98,9 @@ sp_mpeg12_is_format_supported(struct pipe_video_context *vpipe, if (geom & PIPE_TEXTURE_GEOM_NON_POWER_OF_TWO) return FALSE; -<<<<<<< HEAD - return ctx->pipe->screen->is_format_supported(ctx->pipe->screen, format, PIPE_TEXTURE_2D, 1, - usage, geom); -======= + return ctx->pipe->screen->is_format_supported(ctx->pipe->screen, format, PIPE_TEXTURE_2D, 0, usage, geom); ->>>>>>> 97a7cf230a70c64fff300931ae7c00aa00449c97 } static void @@ -134,7 +130,6 @@ static void sp_mpeg12_clear_render_target(struct pipe_video_context *vpipe, struct pipe_surface *dst, unsigned dstx, unsigned dsty, - const float *rgba, unsigned width, unsigned height) { struct sp_mpeg12_context *ctx = (struct sp_mpeg12_context*)vpipe; @@ -151,12 +146,10 @@ sp_mpeg12_clear_render_target(struct pipe_video_context *vpipe, static void sp_mpeg12_resource_copy_region(struct pipe_video_context *vpipe, - struct pipe_resource *dst, - struct pipe_subresource subdst, - unsigned dstx, unsigned dsty, unsigned dstz, - struct pipe_resource *src, - struct pipe_subresource subsrc, - unsigned srcx, unsigned srcy, unsigned srcz, + struct pipe_surface *dst, + unsigned dstx, unsigned dsty, + struct pipe_surface *src, + unsigned srcx, unsigned srcy, unsigned width, unsigned height) { struct sp_mpeg12_context *ctx = (struct sp_mpeg12_context*)vpipe; @@ -164,13 +157,7 @@ sp_mpeg12_resource_copy_region(struct pipe_video_context *vpipe, assert(vpipe); assert(dst); -<<<<<<< HEAD - if (ctx->pipe->resource_copy_region) - ctx->pipe->resource_copy_region(ctx->pipe, dst, subdst, dstx, dsty, dstz, src, subsrc, srcx, srcy, srcz, width, height); - else - util_resource_copy_region(ctx->pipe, dst, subdst, dstx, dsty, dstz, src, subsrc, srcx, srcy, srcz, width, height); -======= - struct pipe_subresource subdst, subsrc; + struct pipe_subresource subdst,subsrc; subdst.face = dst->face; subdst.level = dst->level; subsrc.face = src->face; @@ -184,7 +171,6 @@ sp_mpeg12_resource_copy_region(struct pipe_video_context *vpipe, util_resource_copy_region(ctx->pipe, dst->texture, subdst, dstx, dsty, dst->zslice, src->texture, subsrc, srcx, srcy, src->zslice, width, height); ->>>>>>> 97a7cf230a70c64fff300931ae7c00aa00449c97 } static struct pipe_transfer* @@ -366,18 +352,12 @@ init_pipe_state(struct sp_mpeg12_context *ctx) rast.flatshade = 1; rast.flatshade_first = 0; rast.light_twoside = 0; -<<<<<<< HEAD - rast.cull_face = PIPE_FACE_FRONT; - rast.fill_front = PIPE_POLYGON_MODE_FILL; - rast.fill_back = PIPE_POLYGON_MODE_FILL; -======= rast.front_ccw = 1; rast.cull_face = PIPE_FACE_NONE; rast.fill_back = PIPE_POLYGON_MODE_FILL; rast.fill_front = PIPE_POLYGON_MODE_FILL; rast.offset_point = 0; rast.offset_line = 0; ->>>>>>> 97a7cf230a70c64fff300931ae7c00aa00449c97 rast.scissor = 0; rast.poly_smooth = 0; rast.poly_stipple_enable = 0; @@ -400,11 +380,8 @@ init_pipe_state(struct sp_mpeg12_context *ctx) ctx->rast = ctx->pipe->create_rasterizer_state(ctx->pipe, &rast); ctx->pipe->bind_rasterizer_state(ctx->pipe, ctx->rast); -<<<<<<< HEAD - -======= memset(&blend, 0, sizeof blend); ->>>>>>> 97a7cf230a70c64fff300931ae7c00aa00449c97 + blend.independent_blend_enable = 0; blend.rt[0].blend_enable = 0; blend.rt[0].rgb_func = PIPE_BLEND_ADD; diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h index f8eeebf6a71..8bd509c88c2 100644 --- a/src/gallium/include/pipe/p_defines.h +++ b/src/gallium/include/pipe/p_defines.h @@ -494,10 +494,6 @@ enum pipe_shader_cap #define PIPE_REFERENCED_FOR_READ (1 << 0) #define PIPE_REFERENCED_FOR_WRITE (1 << 1) -<<<<<<< HEAD - -======= ->>>>>>> 97a7cf230a70c64fff300931ae7c00aa00449c97 enum pipe_video_codec { PIPE_VIDEO_CODEC_UNKNOWN = 0, @@ -523,10 +519,7 @@ enum pipe_video_profile PIPE_VIDEO_PROFILE_MPEG4_AVC_HIGH }; -<<<<<<< HEAD -======= ->>>>>>> 97a7cf230a70c64fff300931ae7c00aa00449c97 /** * Composite query types */ @@ -540,10 +533,7 @@ struct pipe_query_data_timestamp_disjoint uint64_t frequency; boolean disjoint; }; -<<<<<<< HEAD -======= ->>>>>>> 97a7cf230a70c64fff300931ae7c00aa00449c97 #ifdef __cplusplus } diff --git a/src/gallium/include/pipe/p_format.h b/src/gallium/include/pipe/p_format.h index 9a59c9f9ea0..119d304d927 100644 --- a/src/gallium/include/pipe/p_format.h +++ b/src/gallium/include/pipe/p_format.h @@ -199,9 +199,9 @@ enum pipe_format { PIPE_FORMAT_AI44 = 142, /* some stencil samplers formats */ - PIPE_FORMAT_X24S8_USCALED = 136, - PIPE_FORMAT_S8X24_USCALED = 137, - PIPE_FORMAT_X32_S8X24_USCALED = 138, + PIPE_FORMAT_X24S8_USCALED = 143, + PIPE_FORMAT_S8X24_USCALED = 144, + PIPE_FORMAT_X32_S8X24_USCALED = 145, PIPE_FORMAT_COUNT }; diff --git a/src/gallium/include/pipe/p_screen.h b/src/gallium/include/pipe/p_screen.h index 0303c5b2ea9..75eeaeba1f7 100644 --- a/src/gallium/include/pipe/p_screen.h +++ b/src/gallium/include/pipe/p_screen.h @@ -92,21 +92,13 @@ struct pipe_screen { */ int (*get_shader_param)( struct pipe_screen *, unsigned shader, enum pipe_shader_cap param ); -<<<<<<< HEAD struct pipe_context * (*context_create)( struct pipe_screen *, void *priv ); -======= - struct pipe_context * (*context_create)( struct pipe_screen *, - void *priv ); ->>>>>>> 97a7cf230a70c64fff300931ae7c00aa00449c97 struct pipe_video_context * (*video_context_create)( struct pipe_screen *screen, enum pipe_video_profile profile, enum pipe_video_chroma_format chroma_format, unsigned width, unsigned height, void *priv ); -<<<<<<< HEAD -======= ->>>>>>> 97a7cf230a70c64fff300931ae7c00aa00449c97 /** * Check if the given pipe_format is supported as a texture or -- 2.30.2