diff --git a/Makefile b/Makefile index 65897861ef0..30269194f4b 100644 --- a/Makefile +++ b/Makefile @@ -347,23 +347,19 @@ GALLIUM_FILES = \ DRI_FILES = \ $(DIRECTORY)/include/GL/internal/dri_interface.h \ - $(DIRECTORY)/include/GL/internal/glcore.h \ $(DIRECTORY)/include/GL/internal/sarea.h \ $(DIRECTORY)/src/glx/Makefile \ - $(DIRECTORY)/src/glx/Makefile \ $(DIRECTORY)/src/glx/*.[ch] \ $(DIRECTORY)/src/mesa/drivers/dri/Makefile \ $(DIRECTORY)/src/mesa/drivers/dri/Makefile.template \ $(DIRECTORY)/src/mesa/drivers/dri/dri.pc.in \ - $(DIRECTORY)/src/mesa/drivers/dri/common/xmlpool/*.[ch] \ $(DIRECTORY)/src/mesa/drivers/dri/common/xmlpool/*.po \ $(DIRECTORY)/src/mesa/drivers/dri/*/*.[chS] \ $(DIRECTORY)/src/mesa/drivers/dri/*/*.cpp \ $(DIRECTORY)/src/mesa/drivers/dri/*/*/*.[chS] \ $(DIRECTORY)/src/mesa/drivers/dri/*/Makefile \ $(DIRECTORY)/src/mesa/drivers/dri/*/*/Makefile \ - $(DIRECTORY)/src/mesa/drivers/dri/*/Doxyfile \ - $(DIRECTORY)/src/mesa/drivers/dri/*/server/*.[ch] + $(DIRECTORY)/src/mesa/drivers/dri/*/Doxyfile SGI_GLU_FILES = \ $(DIRECTORY)/src/glu/Makefile \ diff --git a/configure.ac b/configure.ac index c172c1cbaed..79e134b4254 100644 --- a/configure.ac +++ b/configure.ac @@ -1737,6 +1737,19 @@ if test "x$enable_gallium_swrast" = xyes || test "x$enable_gallium_swrast" = xau fi fi +dnl +dnl Gallium noop configuration +dnl +AC_ARG_ENABLE([gallium-noop], + [AS_HELP_STRING([--enable-gallium-noop], + [build gallium radeon @<:@default=disabled@:>@])], + [enable_gallium_noop="$enableval"], + [enable_gallium_noop=auto]) +if test "x$enable_gallium_noop" = xyes; then + GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS noop" + GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS dri-noop" +fi + dnl prepend CORE_DIRS to SRC_DIRS SRC_DIRS="$CORE_DIRS $SRC_DIRS" diff --git a/docs/GL3.txt b/docs/GL3.txt index cf772a631ae..8628a6e88dd 100644 --- a/docs/GL3.txt +++ b/docs/GL3.txt @@ -20,7 +20,7 @@ Float textures, renderbuffers some infrastructure done Framebuffer objects (GL_EXT_framebuffer_object) DONE Half-float some infrastructure done Multisample blit DONE -Non-normalized Integer texture/framebuffer formats not started +Non-normalized Integer texture/framebuffer formats ~50% done 1D/2D Texture arrays core Mesa, swrast done Packed depth/stencil formats DONE Per-buffer blend and masks (GL_EXT_draw_buffers2) DONE @@ -31,10 +31,11 @@ Transform feedback (GL_EXT_transform_feedback) ~50% done glBindBufferRange, glBindBufferBase commands Vertex array objects (GL_APPLE_vertex_array_object) DONE sRGB framebuffer format (GL_EXT_framebuffer_sRGB) not started -glClearBuffer commands DONE, except for dispatch -glGetStringi command DONE, except for dispatch -glTexParameterI, glGetTexParameterI commands DONE, except for dispatch -glVertexAttribI commands not started +glClearBuffer commands DONE +glGetStringi command DONE +glTexParameterI, glGetTexParameterI commands DONE +glVertexAttribI commands DONE (but converts int + values to floats) GL 3.1: diff --git a/docs/relnotes-7.10.html b/docs/relnotes-7.10.html index 6706caf41df..1f5570d71d3 100644 --- a/docs/relnotes-7.10.html +++ b/docs/relnotes-7.10.html @@ -49,7 +49,7 @@ tbd