diff options
author | Lucas Stach <l.stach@pengutronix.de> | 2014-02-22 12:04:58 +0100 |
---|---|---|
committer | Lucas Stach <l.stach@pengutronix.de> | 2014-07-28 15:03:50 +0200 |
commit | ab16feef33b28d1fa42a8126ca6c21cf085a6a2e (patch) | |
tree | 8f6a9b0152c37e936602c24488b7dd220c1cb4e8 | |
parent | adf73692a55059a3bdab8e7e78d463d88da3ab8d (diff) | |
download | mesa-ab16feef33b28d1fa42a8126ca6c21cf085a6a2e.tar.gz mesa-ab16feef33b28d1fa42a8126ca6c21cf085a6a2e.tar.xz |
etna: load of fixes to properly compile with mesa-10.2.4
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
-rw-r--r-- | src/gallium/drivers/etna/etna_clear_blit.c | 3 | ||||
-rw-r--r-- | src/gallium/drivers/etna/etna_screen.c | 6 | ||||
-rw-r--r-- | src/gallium/include/pipe/p_defines.h | 2 | ||||
-rw-r--r-- | src/gallium/state_trackers/egl/Makefile.sources | 3 | ||||
-rw-r--r-- | src/gallium/targets/egl-static/egl_pipe.c | 2 | ||||
-rw-r--r-- | src/mesa/program/ir_to_mesa.cpp | 3 | ||||
-rw-r--r-- | src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 1 |
7 files changed, 8 insertions, 12 deletions
diff --git a/src/gallium/drivers/etna/etna_clear_blit.c b/src/gallium/drivers/etna/etna_clear_blit.c index 1b3b8f8084..7ed0f44a8e 100644 --- a/src/gallium/drivers/etna/etna_clear_blit.c +++ b/src/gallium/drivers/etna/etna_clear_blit.c @@ -228,8 +228,7 @@ static void etna_pipe_resource_copy_region(struct pipe_context *pipe, * XXX this goes wrong when source surface is supertiled. */ etna_pipe_blit_save_state(pipe); - util_blitter_copy_texture(priv->blitter, dst, dst_level, dstx, dsty, dstz, src, src_level, src_box, - PIPE_MASK_RGBA, false); + util_blitter_copy_texture(priv->blitter, dst, dst_level, dstx, dsty, dstz, src, src_level, src_box); etna_resource_touch(pipe, dst); etna_resource_touch(pipe, src); } diff --git a/src/gallium/drivers/etna/etna_screen.c b/src/gallium/drivers/etna/etna_screen.c index e86025e19e..2a51f81fb1 100644 --- a/src/gallium/drivers/etna/etna_screen.c +++ b/src/gallium/drivers/etna/etna_screen.c @@ -155,7 +155,6 @@ static int etna_screen_get_param( struct pipe_screen *screen, enum pipe_cap para case PIPE_CAP_SEAMLESS_CUBE_MAP_PER_TEXTURE: case PIPE_CAP_TGSI_FS_COORD_ORIGIN_LOWER_LEFT: case PIPE_CAP_TGSI_FS_COORD_PIXEL_CENTER_INTEGER: - case PIPE_CAP_SCALED_RESOLVE: /* Should be possible to support */ case PIPE_CAP_TGSI_CAN_COMPACT_CONSTANTS: /* Don't skip strict max uniform limit check */ case PIPE_CAP_FRAGMENT_COLOR_CLAMPED: case PIPE_CAP_VERTEX_COLOR_CLAMPED: @@ -179,8 +178,6 @@ static int etna_screen_get_param( struct pipe_screen *screen, enum pipe_cap para return 0; case PIPE_CAP_MAX_TEXTURE_ARRAY_LAYERS: return 0; - case PIPE_CAP_MAX_COMBINED_SAMPLERS: - return priv->specs.fragment_sampler_count + priv->specs.vertex_sampler_count; case PIPE_CAP_CUBE_MAP_ARRAY: return 0; case PIPE_CAP_MIN_TEXEL_OFFSET: @@ -432,7 +429,8 @@ static boolean etna_screen_is_video_format_supported( struct pipe_screen *screen static void etna_screen_flush_frontbuffer( struct pipe_screen *screen, struct pipe_resource *resource, unsigned level, unsigned layer, - void *winsys_drawable_handle ) + void *winsys_drawable_handle, + struct pipe_box *subbox) { struct etna_rs_target *drawable = (struct etna_rs_target *)winsys_drawable_handle; struct etna_resource *rt_resource = etna_resource(resource); diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h index 3df8c3c2cc..dcd434bd43 100644 --- a/src/gallium/include/pipe/p_defines.h +++ b/src/gallium/include/pipe/p_defines.h @@ -617,7 +617,7 @@ enum pipe_shader_cap PIPE_SHADER_CAP_PREFERRED_IR = 19, PIPE_SHADER_CAP_TGSI_SQRT_SUPPORTED = 20, PIPE_SHADER_CAP_TGSI_POW_SUPPORTED = 21, - PIPE_SHADER_CAP_TGSI_LRP_SUPPORTED = 22 + PIPE_SHADER_CAP_TGSI_LRP_SUPPORTED = 22, PIPE_SHADER_CAP_MAX_SAMPLER_VIEWS = 23 }; diff --git a/src/gallium/state_trackers/egl/Makefile.sources b/src/gallium/state_trackers/egl/Makefile.sources index 2f60b3ab34..9f4ee08e2d 100644 --- a/src/gallium/state_trackers/egl/Makefile.sources +++ b/src/gallium/state_trackers/egl/Makefile.sources @@ -15,7 +15,8 @@ drm_FILES := \ drm/native_drm.c fbdev_FILES := \ - fbdev/native_fbdev.c + fbdev/native_fbdev.c \ + fbdev/native_fbdev_swrast.c gdi_FILES := \ gdi/native_gdi.c diff --git a/src/gallium/targets/egl-static/egl_pipe.c b/src/gallium/targets/egl-static/egl_pipe.c index 7966d65617..de62d2e8d6 100644 --- a/src/gallium/targets/egl-static/egl_pipe.c +++ b/src/gallium/targets/egl-static/egl_pipe.c @@ -70,8 +70,8 @@ #if _EGL_PIPE_FREEDRENO #include "freedreno/drm/freedreno_drm_public.h" #endif -#if _EGL_PIPE_ETNA /* for etnaviv */ +#if _EGL_PIPE_ETNA #include "etna/drm/etna_drm_public.h" #endif diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp index 4b946ef47c..59cf1232ad 100644 --- a/src/mesa/program/ir_to_mesa.cpp +++ b/src/mesa/program/ir_to_mesa.cpp @@ -3002,8 +3002,7 @@ _mesa_ir_link_shader(struct gl_context *ctx, struct gl_shader_program *prog) do_mat_op_to_vec(ir); lower_instructions(ir, (MOD_TO_FRACT | DIV_TO_MUL_RCP | EXP_TO_EXP2 | LOG_TO_LOG2 | INT_DIV_TO_MUL_RCP - | ((options->EmitNoPow) ? POW_TO_EXP2 : 0) - | ((options->EmitNoLrp) ? LRP_TO_ARITH : 0))); + | ((options->EmitNoPow) ? POW_TO_EXP2 : 0))); progress = do_lower_jumps(ir, true, true, options->EmitNoMainReturn, options->EmitNoCont, options->EmitNoLoops) || progress; diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp index cfd4887cef..162864f6cb 100644 --- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp +++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp @@ -5410,7 +5410,6 @@ st_link_shader(struct gl_context *ctx, struct gl_shader_program *prog) CARRY_TO_ARITH | BORROW_TO_ARITH | (options->EmitNoPow ? POW_TO_EXP2 : 0) | - (options->EmitNoLrp ? LRP_TO_ARITH : 0) | (!ctx->Const.NativeIntegers ? INT_DIV_TO_MUL_RCP : 0)); lower_ubo_reference(prog->_LinkedShaders[i], ir); |