Skip to content
This repository was archived by the owner on Dec 30, 2025. It is now read-only.
This repository was archived by the owner on Dec 30, 2025. It is now read-only.

rebase fresh mesa #4

@fedya

Description

@fedya

Hi please rebase your patches against new mesa 10.4.3

i got this now

[fedya@localhost Mesa-10.4.3]$ patch -p1 < ../../0001-gallium-etna-ported-etnaviv-driver-to-upstream-mesa.patch
patching file configure.ac
Hunk #1 succeeded at 147 (offset 12 lines).
Hunk #3 succeeded at 1943 with fuzz 2 (offset -40 lines).
Hunk #4 succeeded at 2031 (offset -46 lines).
Hunk #5 succeeded at 2174 with fuzz 2 (offset -48 lines).
Hunk #6 succeeded at 2206 (offset -44 lines).
patching file src/egl/main/eglapi.c
patching file src/gallium/Makefile.am
Hunk #1 succeeded at 67 with fuzz 2.
patching file src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c
Reversed (or previously applied) patch detected! Assume -R? [n] y
patching file src/gallium/auxiliary/target-helpers/inline_drm_helper.h
Hunk #6 succeeded at 494 with fuzz 1.
patching file src/gallium/auxiliary/util/u_gen_mipmap.c
patching file src/gallium/auxiliary/util/u_vbuf.c
Hunk #5 succeeded at 535 (offset 1 line).
Hunk #6 succeeded at 605 (offset 1 line).
Hunk #7 succeeded at 647 (offset 1 line).
Hunk #8 succeeded at 816 (offset 1 line).
Hunk #9 succeeded at 839 (offset 1 line).
Hunk #10 succeeded at 955 (offset 1 line).
Hunk #11 succeeded at 1063 (offset 1 line).
Hunk #12 succeeded at 1268 (offset 1 line).
patching file src/gallium/auxiliary/util/u_vbuf.h
patching file src/gallium/drivers/etna/Makefile.am
patching file src/gallium/drivers/etna/Makefile.sources
patching file src/gallium/drivers/etna/etna_asm.c
patching file src/gallium/drivers/etna/etna_asm.h
patching file src/gallium/drivers/etna/etna_blend.c
patching file src/gallium/drivers/etna/etna_blend.h
patching file src/gallium/drivers/etna/etna_clear_blit.c
patching file src/gallium/drivers/etna/etna_clear_blit.h
patching file src/gallium/drivers/etna/etna_compiler.c
patching file src/gallium/drivers/etna/etna_compiler.h
patching file src/gallium/drivers/etna/etna_debug.h
patching file src/gallium/drivers/etna/etna_fence.c
patching file src/gallium/drivers/etna/etna_fence.h
patching file src/gallium/drivers/etna/etna_internal.h
patching file src/gallium/drivers/etna/etna_pipe.c
patching file src/gallium/drivers/etna/etna_pipe.h
patching file src/gallium/drivers/etna/etna_rasterizer.c
patching file src/gallium/drivers/etna/etna_rasterizer.h
patching file src/gallium/drivers/etna/etna_resource.c
patching file src/gallium/drivers/etna/etna_resource.h
patching file src/gallium/drivers/etna/etna_screen.c
patching file src/gallium/drivers/etna/etna_screen.h
patching file src/gallium/drivers/etna/etna_shader.c
patching file src/gallium/drivers/etna/etna_shader.h
patching file src/gallium/drivers/etna/etna_surface.c
patching file src/gallium/drivers/etna/etna_surface.h
patching file src/gallium/drivers/etna/etna_texture.c
patching file src/gallium/drivers/etna/etna_texture.h
patching file src/gallium/drivers/etna/etna_transfer.c
patching file src/gallium/drivers/etna/etna_transfer.h
patching file src/gallium/drivers/etna/etna_translate.h
patching file src/gallium/drivers/etna/etna_zsa.c
patching file src/gallium/drivers/etna/etna_zsa.h
patching file src/gallium/include/pipe/p_defines.h
Hunk #3 FAILED at 574.
Hunk #4 FAILED at 616.
Hunk #5 succeeded at 634 (offset 3 lines).
2 out of 5 hunks FAILED -- saving rejects to file src/gallium/include/pipe/p_defines.h.rej
patching file src/gallium/state_trackers/egl/Makefile.am
patching file src/gallium/state_trackers/egl/Makefile.sources
patching file src/gallium/state_trackers/egl/fbdev/native_fbdev.c
patching file src/gallium/state_trackers/egl/fbdev/native_fbdev.h
patching file src/gallium/state_trackers/egl/fbdev/native_fbdev_swrast.c
patching file src/gallium/state_trackers/egl/fbdev/native_fbdev_swrast.h
patching file src/gallium/targets/dri/Makefile.am
Hunk #1 FAILED at 93.
1 out of 1 hunk FAILED -- saving rejects to file src/gallium/targets/dri/Makefile.am.rej
patching file src/gallium/targets/egl-static/Makefile.am
Hunk #1 FAILED at 233.
1 out of 1 hunk FAILED -- saving rejects to file src/gallium/targets/egl-static/Makefile.am.rej
patching file src/gallium/winsys/etna/drm/Makefile.am
patching file src/gallium/winsys/etna/drm/etna_drm_public.h
patching file src/gallium/winsys/etna/drm/etna_drm_winsys.c
patching file src/gallium/winsys/etna/fbdev/Makefile.am
patching file src/gallium/winsys/etna/fbdev/etna_fbdev_public.h
patching file src/gallium/winsys/etna/fbdev/etna_fbdev_winsys.c
patching file src/glsl/ir_optimization.h
patching file src/mesa/main/mtypes.h
Hunk #1 succeeded at 2990 (offset 91 lines).
patching file src/mesa/program/ir_to_mesa.cpp
Hunk #1 FAILED at 2952.
1 out of 1 hunk FAILED -- saving rejects to file src/mesa/program/ir_to_mesa.cpp.rej
patching file src/mesa/state_tracker/st_extensions.c
Hunk #1 succeeded at 216 (offset 4 lines).
Hunk #2 succeeded at 441 (offset -2 lines).
patching file src/mesa/state_tracker/st_glsl_to_tgsi.cpp
Hunk #1 succeeded at 5400 (offset -21 lines).

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions