diff options
Diffstat (limited to 'mesalib')
28 files changed, 743 insertions, 374 deletions
diff --git a/mesalib/Makefile.am b/mesalib/Makefile.am index ee733339a..0e61a55d5 100644 --- a/mesalib/Makefile.am +++ b/mesalib/Makefile.am @@ -30,7 +30,6 @@ check-local: $(MAKE) -C src/mapi/glapi/tests check $(MAKE) -C src/mapi/shared-glapi/tests check $(MAKE) -C src/mesa/main/tests check - $(MAKE) -C src/glsl/tests check $(MAKE) -C src/glx/tests check .PHONY: doxygen @@ -53,9 +52,9 @@ EXTRA_FILES = \ bin/ltmain.sh \ bin/missing \ bin/ylwrap \ - src/glsl/glsl_parser.cc \ + src/glsl/glsl_parser.cpp \ src/glsl/glsl_parser.h \ - src/glsl/glsl_lexer.cc \ + src/glsl/glsl_lexer.cpp \ src/glsl/glcpp/glcpp-lex.c \ src/glsl/glcpp/glcpp-parse.c \ src/glsl/glcpp/glcpp-parse.h \ @@ -76,8 +75,7 @@ IGNORE_FILES = \ parsers: configure - $(MAKE) -C src/glsl glsl_parser.cc glsl_parser.h glsl_lexer.cc - $(MAKE) -C src/glsl/glcpp glcpp-lex.c glcpp-parse.c glcpp-parse.h + $(MAKE) -C src/glsl glsl_parser.cpp glsl_parser.h glsl_lexer.cpp glcpp/glcpp-lex.c glcpp/glcpp-parse.c glcpp/glcpp-parse.h $(MAKE) -C src/mesa/program lex.yy.c program_parse.tab.c program_parse.tab.h # Everything for new a Mesa release: diff --git a/mesalib/configure.ac b/mesalib/configure.ac index e7c234016..e769edadb 100644 --- a/mesalib/configure.ac +++ b/mesalib/configure.ac @@ -56,14 +56,12 @@ AC_PROG_MKDIR_P LT_PREREQ([2.2]) LT_INIT([disable-static]) -AC_PROG_YACC -AC_PATH_PROG([YACC_INST], $YACC) -if test ! -f "$srcdir/src/glsl/glcpp/glcpp-parse.c"; then - if test -z "$YACC_INST"; then - AC_MSG_ERROR([yacc not found - unable to compile glcpp-parse.y]) - fi -fi -AC_PROG_LEX +AX_PROG_BISON([], + AS_IF([test ! -f "$srcdir/src/glsl/glcpp/glcpp-parse.c"] + [AC_MSG_ERROR([bison not found - unable to compile glcpp-parse.y])])) +AX_PROG_FLEX([], + AS_IF([test ! -f "$srcdir/src/glsl/glcpp/glcpp-lex.c"] + [AC_MSG_ERROR([flex not found - unable to compile glcpp-lex.l])])) AC_PATH_PROG([PERL], [perl]) @@ -1967,6 +1965,8 @@ AM_CONDITIONAL(HAVE_X86_ASM, echo "$DEFINES" | grep 'X86_ASM' >/dev/null 2>&1) AM_CONDITIONAL(HAVE_X86_64_ASM, echo "$DEFINES" | grep 'X86_64_ASM' >/dev/null 2>&1) AM_CONDITIONAL(HAVE_SPARC_ASM, echo "$DEFINES" | grep 'SPARC_ASM' >/dev/null 2>&1) +AM_CONDITIONAL(CROSS_COMPILING, test "x$cross_compiling" = xyes) + AC_SUBST([VDPAU_MAJOR], 1) AC_SUBST([VDPAU_MINOR], 0) @@ -2080,8 +2080,6 @@ AC_CONFIG_FILES([Makefile src/gbm/main/gbm.pc src/glsl/Makefile src/glsl/builtin_compiler/Makefile - src/glsl/glcpp/Makefile - src/glsl/tests/Makefile src/glx/Makefile src/glx/tests/Makefile src/gtest/Makefile diff --git a/mesalib/docs/GL3.txt b/mesalib/docs/GL3.txt index 3bf91eae5..21c37c008 100644 --- a/mesalib/docs/GL3.txt +++ b/mesalib/docs/GL3.txt @@ -121,7 +121,7 @@ GL_ARB_compressed_texture_pixel_storage not started GL_ARB_shader_atomic_counters not started GL_ARB_texture_storage DONE (r300, r600, swrast, gallium) GL_ARB_transform_feedback_instanced DONE -GL_ARB_base_instance DONE (nv50, nvc0, r600, radeonsi) +GL_ARB_base_instance DONE (i965, nv50, nvc0, r600, radeonsi) GL_ARB_shader_image_load_store not started GL_ARB_conservative_depth DONE (softpipe) GL_ARB_shading_language_420pack not started diff --git a/mesalib/docs/index.html b/mesalib/docs/index.html index 546a32f53..5c922042c 100644 --- a/mesalib/docs/index.html +++ b/mesalib/docs/index.html @@ -16,6 +16,14 @@ <h1>News</h1> +<h2>January 22, 2013</h2> + +<p> +<a href="relnotes-9.0.2.html">Mesa 9.0.2</a> is released. +This is a bug fix release. +</p> + + <h2>November 16, 2012</h2> <p> diff --git a/mesalib/docs/relnotes-9.0.2.html b/mesalib/docs/relnotes-9.0.2.html new file mode 100644 index 000000000..65b9b1116 --- /dev/null +++ b/mesalib/docs/relnotes-9.0.2.html @@ -0,0 +1,290 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> +<html lang="en"> +<head> + <meta http-equiv="content-type" content="text/html; charset=utf-8"> + <title>Mesa Release Notes</title> + <link rel="stylesheet" type="text/css" href="mesa.css"> +</head> +<body> + +<div class="header"> + <h1>The Mesa 3D Graphics Library</h1> +</div> + +<iframe src="contents.html"></iframe> +<div class="content"> + +<h1>Mesa 9.0.2 Release Notes / January 22th, 2013</h1> + +<p> +Mesa 9.0.2 is a bug fix release which fixes bugs found since the 9.0.1 release. +</p> +<p> +Mesa 9.0 implements the OpenGL 3.1 API, but the version reported by +glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) / +glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used. +Some drivers don't support all the features required in OpenGL 3.1. OpenGL +3.1 is <strong>only</strong> available if requested at context creation +because GL_ARB_compatibility is not supported. +</p> + +<h2>MD5 checksums</h2> +<pre> +5ae216ca9fecfa349f14ecb83aa3f124 MesaLib-9.0.2.tar.gz +dc45d1192203e418163e0017640e1cfc MesaLib-9.0.2.tar.bz2 +93d40ec77d656dd04b561ba203ffbb91 MesaLib-9.0.2.zip +</pre> + +<h2>New features</h2> +<p>None.</p> + +<h2>Bug fixes</h2> + +<p>This list is likely incomplete.</p> + +<ul> +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=22576">Bug 22576</a> - [KMS] mesa demo spectex broken on rv280</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=26809">Bug 26809</a> - KMS/R200: Bad shading in NWN since Mesa rewrite</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=45877">Bug 45877</a> - [bisected regression] Oglc fbo(negative.invalidParams3) Segmentation fault</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=54402">Bug 54402</a> - st_glsl_to_tgsi.cpp:4006:dst_register: Assertion `index < VERT_RESULT_MAX' failed</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=55175">Bug 55175</a> - Memoryleak with glPopAttrib only on Intel GM45</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=56442">Bug 56442</a> - glcpp accepts junk after #else/#elif/#endif tokens</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=56706">Bug 56706</a> - EGL sets error to EGL_SUCCESS when DRI driver fails to create context</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=57622">Bug 57622</a> - Webgl conformance shader-with-non-reserved-words crash.</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=57842">Bug 57842</a> - r200: Culling is broken when rendering to an FBO</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=57984">Bug 57984</a> - r300g: blend sfactor=GL_DST_COLOR fails with FBOs</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=58545">Bug 58545</a> - [llvmpipe] src/gallium/auxiliary/gallivm/lp_bld_tgsi_info.c:75:analyse_src: Assertion `src->Index < (sizeof(ctx->imm)/sizeof((ctx->imm)[0]))' failed.</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=59383">Bug 59383</a> - src/glsl/tests/Makefile.am missing $(top_srcdir)/include</li> + +<!-- <li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=">Bug </a> - </li> --> +</ul> + + +<h2>Changes</h2> +<p>The full set of changes can be viewed by using the following GIT command:</p> + +<pre> + git log mesa-9.0.1..mesa-9.0.2 +</pre> + +<p>Abdiel Janulgue (1):</p> +<ul> + <li>mesa: Fix a crash in update_texture_state() for external texture type</li> +</ul> + +<p>Adam Jackson (4):</p> +<ul> + <li>glcpp: Fix visibility CFLAGS in automake</li> + <li>glcpp: Typo fix.</li> + <li>galahad, noop: Fix visibility CFLAGS in automake</li> + <li>r300g: Fix visibility CFLAGS in automake</li> +</ul> + +<p>Alex Deucher (2):</p> +<ul> + <li>radeonsi: add some new SI pci ids</li> + <li>radeonsi: add a new SI pci id</li> +</ul> + +<p>Ander Conselvan de Oliveira (2):</p> +<ul> + <li>egl/wayland: Don't invalidate drawable on swap buffers</li> + <li>egl/wayland: Dispatch the event queue before get_buffers</li> + <li>egl/wayland: Destroy the pending buffer callback with the egl surface</li> +</ul> + +<p>Andreas Boll (9):</p> +<ul> + <li>docs: fix release date of 9.0.1</li> + <li>docs: add news item for 9.0.1 release</li> + <li>Add .dirstamp to toplevel .gitignore</li> + <li>build: use git ls-files for adding all Makefile.in into the release tarball</li> + <li>build: Fix GLES linkage without libglapi</li> + <li>Revert "r600g: try to fix streamout for the cases where BURST_COUNT > 0"</li> + <li>mesa: update .cherry-ignore list</li> + <li>mesa: Bump version to 9.0.2</li> + <li>docs: Add 9.0.2 release notes</li> +</ul> + +<p>Anuj Phogat (2):</p> +<ul> + <li>mesa: Generate invalid operation in glGenerateMipMap for integer textures</li> + <li>meta: Remove redundant code in _mesa_meta_GenerateMipmap</li> +</ul> + +<p>Ben Skeggs (3):</p> +<ul> + <li>nvc0: fix missing permanent bo reference on poly cache</li> + <li>nvc0: point vertex runout at a valid address</li> + <li>nv50: point vertex runout at a valid address</li> +</ul> + +<p>Brian Paul (5):</p> +<ul> + <li>svga: don't use uninitialized framebuffer state</li> + <li>st/mesa: replace REALLOC() with realloc()</li> + <li>st/mesa: free TGSI tokens with ureg_free_tokens()</li> + <li>util: added pipe_surface_release() function</li> + <li>gallivm: support more immediates in lp_build_tgsi_info()</li> +</ul> + +<p>Bryan Cain (1):</p> +<ul> + <li>glsl_to_tgsi: set correct register type for array and structure elements</li> +</ul> + +<p>Chad Versace (2):</p> +<ul> + <li>i965: Validate requested GLES context version in brwCreateContext</li> + <li>egl/dri2: Set error code when dri2CreateContextAttribs fails</li> +</ul> + +<p>Chris Fester (1):</p> +<ul> + <li>util: null-out the node's prev/next pointers in list_del()</li> +</ul> + +<p>Christoph Bumiller (5):</p> +<ul> + <li>nv50/ir/tgsi: fix srcMask for TXP with SHADOW1D</li> + <li>nvc0: add missing call to map edge flag in push_vbo</li> + <li>nv50/ir: wrap assertion using typeid in #ifndef NDEBUG</li> + <li>nouveau: fix undefined behaviour when testing sample_count</li> + <li>nv50/ir: restore use of long immediate encodings</li> +</ul> + +<p>Dave Airlie (5):</p> +<ul> + <li>r600g: fix lod bias/explicit lod with cube maps.</li> + <li>glsl_to_tgsi: fix dst register for texturing fetches.</li> + <li>glsl: fix cut-n-paste error in error handling. (v2)</li> + <li>glsl: initialise killed_all field.</li> + <li>glsl: fix uninitialised variable from constructor</li> +</ul> + +<p>Eric Anholt (4):</p> +<ul> + <li>mesa: Fix the core GL genned-name handling for glBindBufferBase()/Range().</li> + <li>mesa: Fix core GL genned-name handling for glBeginQuery().</li> + <li>mesa: Fix segfault on reading from a missing color read buffer.</li> + <li>i965/gen4: Fix memory leak each time compile_gs_prog() is called.</li> +</ul> + +<p>Ian Romanick (2):</p> +<ul> + <li>docs: Add 9.0.1 release md5sums</li> + <li>glsl: Don't add structure fields to the symbol table</li> +</ul> + +<p>Johannes Obermayr (4):</p> +<ul> + <li>clover: Install CL headers.</li> + <li>gallium/auxiliary: Add -fno-rtti to CXXFLAGS on LLVM >= 3.2.</li> + <li>clover: Adapt libclc's INCLUDEDIR and LIBEXECDIR to make use of the new introduced libclc.pc.</li> + <li>tests: AM_CPPFLAGS must include $(top_srcdir) instead of $(top_builddir).</li> +</ul> + +<p>Jonas Ådahl (1):</p> +<ul> + <li>wayland: Don't cancel a roundtrip when any event is received</li> +</ul> + +<p>José Fonseca (1):</p> +<ul> + <li>llvmpipe: Obey back writemask.</li> +</ul> + +<p>Kenneth Graunke (8):</p> +<ul> + <li>i965/vs: Fix unit mismatch in scratch base_offset parameter.</li> + <li>i965/vs: Implement register spilling.</li> + <li>mesa: Don't flatten IF statements by default.</li> + <li>glcpp: Don't use infinite lookhead for #define differentiation.</li> + <li>i965/vs: Don't lose the MRF writemask when doing compute-to-MRF.</li> + <li>i965/vs: Preserve the type when copy propagating into an instruction.</li> + <li>mesa: Fix glGetVertexAttribI[u]iv now that we have real integer attribs.</li> + <li>i965: Fix AA Line Distance Mode in 3DSTATE_SF on Ivybridge.</li> +</ul> + +<p>Kristian Høgsberg (1):</p> +<ul> + <li>egl/wayland: Add invalidate back in eglSwapBuffers()</li> +</ul> + +<p>Maarten Lankhorst (2):</p> +<ul> + <li>makefiles: use configured name for -ldrm* where possible</li> + <li>automake: strip LLVM_CXXFLAGS and LLVM_CPPFLAGS too</li> +</ul> + +<p>Marek Olšák (17):</p> +<ul> + <li>st/mesa: fix integer texture border color for some formats (v2)</li> + <li>r300g: fix texture border color for sRGB formats</li> + <li>mesa: bump MAX_VARYING to 32</li> + <li>draw: fix assertion failure in draw_emit_vertex_attr</li> + <li>vbo: fix glVertexAttribI* functions</li> + <li>mesa: add MaxNumLevels to gl_texture_image, remove MaxLog2</li> + <li>mesa: fix error checking of TexStorage(levels) for array and rect textures</li> + <li>st/mesa: fix guessing the base level size</li> + <li>st/mesa: fix computation of last_level during texture creation</li> + <li>st/mesa: fix computation of last_level in GenerateMipmap</li> + <li>r600g: fix streamout on RS780 and RS880</li> + <li>r600g: advertise 32 streamout vec4 outputs</li> + <li>r600g: fix broken streamout if streamout_begin caused a context flush</li> + <li>mesa: fix BlitFramebuffer between linear and sRGB formats</li> + <li>r600g: try to fix streamout for the cases where BURST_COUNT > 0</li> + <li>r600g: always use a tiled resource as the destination of MSAA resolve</li> + <li>mesa: add MaxNumLevels to gl_texture_image, remove MaxLog2</li> +</ul> + +<p>Mario Kleiner (1):</p> +<ul> + <li>mesa: Don't glPopAttrib() GL_POINT_SPRITE_COORD_ORIGIN on < OpenGL-2.0</li> +</ul> + +<p>Matt Turner (1):</p> +<ul> + <li>glcpp: Reject garbage after #else and #endif tokens</li> +</ul> + +<p>Stefan Dösinger (1):</p> +<ul> + <li>r300: Don't disable destination read if the src blend factor needs it</li> +</ul> + +<p>Tapani Pälli (1):</p> +<ul> + <li>android: generate matching remap_helper to dispatch table</li> +</ul> + +<p>Tom Stellard (1):</p> +<ul> + <li>r600g: Use LOOP_START_DX10 for loops</li> +</ul> + +<p>Vinson Lee (1):</p> +<ul> + <li>i915: Fix wrong sizeof argument in i915_update_tex_unit.</li> +</ul> + +<p>smoki (2):</p> +<ul> + <li>r200: fix broken tcl lighting</li> + <li>radeon/r200: Fix tcl culling</li> +</ul> + +</div> +</body> +</html> diff --git a/mesalib/docs/relnotes.html b/mesalib/docs/relnotes.html index a4654025e..e3730913f 100644 --- a/mesalib/docs/relnotes.html +++ b/mesalib/docs/relnotes.html @@ -22,6 +22,7 @@ The release notes summarize what's new or changed in each Mesa release. <ul> <li><a href="relnotes-9.1.html">9.1 release notes</a> +<li><a href="relnotes-9.0.2.html">9.0.2 release notes</a> <li><a href="relnotes-9.0.1.html">9.0.1 release notes</a> <li><a href="relnotes-9.0.html">9.0 release notes</a> <li><a href="relnotes-8.0.5.html">8.0.5 release notes</a> diff --git a/mesalib/m4/ax_prog_bison.m4 b/mesalib/m4/ax_prog_bison.m4 new file mode 100644 index 000000000..dae4470ea --- /dev/null +++ b/mesalib/m4/ax_prog_bison.m4 @@ -0,0 +1,71 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_prog_bison.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_BISON(ACTION-IF-TRUE,ACTION-IF-FALSE) +# +# DESCRIPTION +# +# Check whether bison is the parser generator. Run ACTION-IF-TRUE if +# successful, ACTION-IF-FALSE otherwise +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini <salvestrini@users.sourceforge.net> +# Copyright (c) 2010 Diego Elio Petteno` <flameeyes@gmail.com> +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see <http://www.gnu.org/licenses/>. +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 9 + +# mattst88: +# Modified YACC assignment to remove -o y.tab.c since we're writing +# our own .y/.yy rules. +# +# Replaced m4_ifnblank(...) with m4_ifval(m4_normalize(...), ...) +# since m4_ifnblank requires autoconf-2.64. + +AC_DEFUN([AX_PROG_BISON], [ + AC_REQUIRE([AC_PROG_YACC]) + AC_REQUIRE([AC_PROG_EGREP]) + + AC_CACHE_CHECK([if bison is the parser generator],[ax_cv_prog_bison],[ + AS_IF([$YACC --version 2>/dev/null | $EGREP -q '^bison '], + [ax_cv_prog_bison=yes], [ax_cv_prog_bison=no]) + ]) + AS_IF([test "$ax_cv_prog_bison" = "yes"], [ + dnl replace the yacc-compatible compiler with the real bison, as + dnl otherwise autoconf limits us to the POSIX yacc. + dnl We also change the generated filename to the old one, so that + dnl automake's ylwrap can deal with it. + YACC="${YACC% -y}" + ] m4_ifval(m4_normalize([$1]), [[$1]]), + m4_ifval(m4_normalize([$2]), [[$2]]) + ) +]) diff --git a/mesalib/m4/ax_prog_flex.m4 b/mesalib/m4/ax_prog_flex.m4 new file mode 100644 index 000000000..117f8fe67 --- /dev/null +++ b/mesalib/m4/ax_prog_flex.m4 @@ -0,0 +1,63 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_prog_flex.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_FLEX(ACTION-IF-TRUE,ACTION-IF-FALSE) +# +# DESCRIPTION +# +# Check whether flex is the scanner generator. Run ACTION-IF-TRUE if +# successful, ACTION-IF-FALSE otherwise +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini <salvestrini@users.sourceforge.net> +# Copyright (c) 2010 Diego Elio Petteno` <flameeyes@gmail.com> +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see <http://www.gnu.org/licenses/>. +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 9 + +# mattst88: +# Replaced m4_ifnblank(...) with m4_ifval(m4_normalize(...), ...) +# since m4_ifnblank requires autoconf-2.64. + +AC_DEFUN([AX_PROG_FLEX], [ + AC_REQUIRE([AM_PROG_LEX]) + AC_REQUIRE([AC_PROG_EGREP]) + + AC_CACHE_CHECK([if flex is the lexer generator],[ax_cv_prog_flex],[ + AS_IF([$LEX --version 2>/dev/null | $EGREP -q '^flex '], + [ax_cv_prog_flex=yes], [ax_cv_prog_flex=no]) + ]) + AS_IF([test "$ax_cv_prog_flex" = "yes"], + m4_ifval(m4_normalize([$1]), [[$1]]), + m4_ifval(m4_normalize([$2]), [[$2]]) + ) +]) diff --git a/mesalib/m4/ax_python_module.m4 b/mesalib/m4/ax_python_module.m4 index 3afc40420..2e6670a0f 100644 --- a/mesalib/m4/ax_python_module.m4 +++ b/mesalib/m4/ax_python_module.m4 @@ -25,13 +25,13 @@ AU_ALIAS([AC_PYTHON_MODULE], [AX_PYTHON_MODULE]) AC_DEFUN([AX_PYTHON_MODULE],[ - if test -z $PYTHON; + if test -z $PYTHON2; then - PYTHON="python" + PYTHON2="python" fi - PYTHON_NAME=`basename $PYTHON` + PYTHON_NAME=`basename $PYTHON2` AC_MSG_CHECKING($PYTHON_NAME module: $1) - $PYTHON -c "import $1" 2>/dev/null + $PYTHON2 -c "import $1" 2>/dev/null if test $? -eq 0; then AC_MSG_RESULT(yes) diff --git a/mesalib/scons/custom.py b/mesalib/scons/custom.py index 277c05b67..658df9782 100644 --- a/mesalib/scons/custom.py +++ b/mesalib/scons/custom.py @@ -240,6 +240,11 @@ def parse_source_list(env, filename, names=None): top_srcdir = env.Dir('#').abspath top_builddir = os.path.join(top_srcdir, env['build_dir']) + # Normalize everything to / slashes + cur_srcdir = cur_srcdir.replace('\\', '/') + top_srcdir = top_srcdir.replace('\\', '/') + top_builddir = top_builddir.replace('\\', '/') + # Populate the symbol table of the Makefile parser. parser.add_symbol('top_srcdir', top_srcdir) parser.add_symbol('top_builddir', top_builddir) @@ -263,8 +268,8 @@ def parse_source_list(env, filename, names=None): if f: # Process source paths if f.startswith(top_builddir + '/src'): - # Automake puts build output on a `src` subdirectory, bue - # SCons does no, so strip it here. + # Automake puts build output on a `src` subdirectory, but + # SCons does not, so strip it here. f = top_builddir + f[len(top_builddir + '/src'):] if f.startswith(cur_srcdir + '/'): # Prefer relative source paths, as absolute files tend to diff --git a/mesalib/scons/gallium.py b/mesalib/scons/gallium.py index 7207c6bb2..a8b1f0301 100644 --- a/mesalib/scons/gallium.py +++ b/mesalib/scons/gallium.py @@ -399,7 +399,6 @@ def generate(env): ccflags += [ '/Od', # disable optimizations '/Oi', # enable intrinsic functions - '/Oy-', # disable frame pointer omission ] else: ccflags += [ @@ -411,6 +410,7 @@ def generate(env): ] else: ccflags += [ + '/Oy-', # disable frame pointer omission '/GL-', # disable whole program optimization ] ccflags += [ diff --git a/mesalib/src/glsl/.gitignore b/mesalib/src/glsl/.gitignore index 4eb4fef9b..2cf5b0007 100644 --- a/mesalib/src/glsl/.gitignore +++ b/mesalib/src/glsl/.gitignore @@ -1,7 +1,8 @@ glsl_compiler -glsl_lexer.cc -glsl_parser.cc +glsl_lexer.cpp +glsl_parser.cpp glsl_parser.h glsl_parser.output builtin_function.cpp +builtincompiler glsl_test diff --git a/mesalib/src/glsl/Android.mk b/mesalib/src/glsl/Android.mk index f5006ab03..f088e67cb 100644 --- a/mesalib/src/glsl/Android.mk +++ b/mesalib/src/glsl/Android.mk @@ -58,7 +58,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := \ $(LIBGLCPP_FILES) \ $(LIBGLSL_FILES) \ - $(GLSL_SRCDIR)/builtin_compiler/builtin_stubs.cpp \ + $(BUILTIN_COMPILER_CXX_FILES) \ $(GLSL_COMPILER_CXX_FILES) LOCAL_C_INCLUDES := \ diff --git a/mesalib/src/glsl/Makefile.am b/mesalib/src/glsl/Makefile.am index 36af90ef1..058d8aed3 100644 --- a/mesalib/src/glsl/Makefile.am +++ b/mesalib/src/glsl/Makefile.am @@ -19,41 +19,84 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # IN THE SOFTWARE. -SUBDIRS = builtin_compiler glcpp +SUBDIRS = builtin_compiler AM_CPPFLAGS = \ -I$(top_srcdir)/include \ -I$(top_srcdir)/src/mapi \ -I$(top_srcdir)/src/mesa/ \ + -I$(top_srcdir)/src/glsl/glcpp \ + -I$(top_srcdir)/src/gtest/include \ $(DEFINES) \ $(API_DEFINES) AM_CFLAGS = $(VISIBILITY_CFLAGS) AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS) -AM_LFLAGS = --nounistd -o$(LEX_OUTPUT_ROOT).c - include Makefile.sources -noinst_LTLIBRARIES = libglsl.la -check_PROGRAMS = glsl_test -noinst_PROGRAMS = glsl_compiler +TESTS = glcpp/tests/glcpp-test \ + tests/optimization-test \ + tests/ralloc-test \ + tests/uniform-initializer-test -libglsl_la_SOURCES = \ - glsl_lexer.ll \ - glsl_parser.cc \ - $(LIBGLSL_FILES) \ - builtin_function.cpp +TESTS_ENVIRONMENT= \ + export PYTHON2=$(PYTHON2); \ + export PYTHON_FLAGS=$(PYTHON_FLAGS); -libglsl_la_LIBADD = glcpp/libglcpp.la -libglsl_la_LDFLAGS = +noinst_LTLIBRARIES = libglsl.la libglcpp.la +check_PROGRAMS = \ + glcpp/glcpp \ + glsl_test \ + tests/ralloc-test \ + tests/uniform-initializer-test -glsl_compiler_SOURCES = \ - $(top_srcdir)/src/mesa/main/hash_table.c \ - $(top_srcdir)/src/mesa/program/prog_hash_table.c \ - $(top_srcdir)/src/mesa/program/symbol_table.c \ - $(GLSL_COMPILER_CXX_FILES) +tests_uniform_initializer_test_SOURCES = \ + $(top_srcdir)/src/mesa/main/hash_table.c \ + $(top_srcdir)/src/mesa/program/prog_hash_table.c\ + $(top_srcdir)/src/mesa/program/symbol_table.c \ + tests/copy_constant_to_storage_tests.cpp \ + tests/set_uniform_initializer_tests.cpp \ + tests/uniform_initializer_utils.cpp +tests_uniform_initializer_test_CFLAGS = \ + $(PTHREAD_CFLAGS) +tests_uniform_initializer_test_LDADD = \ + $(top_builddir)/src/gtest/libgtest.la \ + $(top_builddir)/src/glsl/libglsl.la \ + $(PTHREAD_LIBS) + +tests_ralloc_test_SOURCES = \ + tests/ralloc_test.cpp \ + $(top_builddir)/src/glsl/ralloc.c +tests_ralloc_test_CFLAGS = $(PTHREAD_CFLAGS) +tests_ralloc_test_LDADD = \ + $(top_builddir)/src/gtest/libgtest.la \ + $(PTHREAD_LIBS) -glsl_compiler_LDADD = libglsl.la +if CROSS_COMPILING +libglcpp_la_SOURCES = \ + glcpp/glcpp-lex.c \ + glcpp/glcpp-parse.c \ + $(LIBGLCPP_FILES) +else +libglcpp_la_LIBADD = builtin_compiler/libglcpp.la +endif + +glcpp_glcpp_SOURCES = \ + glcpp/glcpp.c \ + $(top_srcdir)/src/mesa/program/prog_hash_table.c +glcpp_glcpp_LDADD = libglcpp.la + +libglsl_la_SOURCES = builtin_function.cpp +libglsl_la_LIBADD = libglcpp.la +if CROSS_COMPILING +libglsl_la_SOURCES += \ + glsl_lexer.cpp \ + glsl_parser.cpp \ + $(LIBGLSL_FILES) +else +libglsl_la_LIBADD += \ + builtin_compiler/libglslcore.la +endif glsl_test_SOURCES = \ $(top_srcdir)/src/mesa/main/hash_table.c \ @@ -65,15 +108,65 @@ glsl_test_SOURCES = \ glsl_test_LDADD = libglsl.la -# automake <=1.11 and automake >=1.12 have different conventions for naming C++ header files -# made by yacc. To work with both, we write our own rule rather than using automake's. -# When (if) we require automake >=1.12 in configure.ac, this can be removed, and we can use -# the automake rule. -glsl_parser.cc glsl_parser.h: glsl_parser.yy - $(AM_V_GEN) $(YACC) -v -o glsl_parser.cc -p "_mesa_glsl_" --defines=glsl_parser.h $< +# We write our own rules for yacc and lex below. We'd rather use automake, +# but automake makes it especially difficult for a number of reasons: +# +# * < automake-1.12 generates .h files from .yy and .ypp files, but +# >=automake-1.12 generates .hh and .hpp files respectively. There's no +# good way of making a project that uses C++ yacc files compatible with +# both versions of automake. Strong work automake developers. +# +# * Since we're generating code from .l/.y files in a subdirectory (glcpp/) +# we'd like the resulting generated code to also go in glcpp/ for purposes +# of distribution. Automake gives no way to do this. +# +# * Since we're building multiple yacc parsers into one library (and via one +# Makefile) we have to use per-target YFLAGS. Using per-target YFLAGS causes +# automake to name the resulting generated code as <library-name>_filename.c. +# Frankly, that's ugly and we don't want a libglcpp_glcpp_parser.h file. + +# In order to make build output print "LEX" and "YACC", we reproduce the +# automake variables below. + +AM_V_LEX = $(am__v_LEX_$(V)) +am__v_LEX_ = $(am__v_LEX_$(AM_DEFAULT_VERBOSITY)) +am__v_LEX_0 = @echo " LEX " $@; +am__v_LEX_1 = + +AM_V_YACC = $(am__v_YACC_$(V)) +am__v_YACC_ = $(am__v_YACC_$(AM_DEFAULT_VERBOSITY)) +am__v_YACC_0 = @echo " YACC " $@; +am__v_YACC_1 = + +glsl_parser.cpp glsl_parser.h: glsl_parser.yy + $(AM_V_YACC) $(YACC) $(YFLAGS) -o $@ -p "_mesa_glsl_" --defines=$(GLSL_BUILDDIR)/glsl_parser.h $< + +glsl_lexer.cpp: glsl_lexer.ll + $(AM_V_LEX) $(LEX) $(LFLAGS) -o $@ $< + +glcpp/glcpp-parse.c glcpp/glcpp-parse.h: glcpp/glcpp-parse.y + $(MKDIR_P) $(GLSL_BUILDDIR)/glcpp + $(AM_V_YACC) $(YACC) $(YFLAGS) -o $@ -p "glcpp_parser_" --defines=$(GLSL_BUILDDIR)/glcpp/glcpp-parse.h $< + +glcpp/glcpp-lex.c: glcpp/glcpp-lex.l + $(MKDIR_P) $(GLSL_BUILDDIR)/glcpp + $(AM_V_LEX) $(LEX) $(LFLAGS) -o $@ $< -BUILT_SOURCES = glsl_parser.h -CLEANFILES = glsl_lexer.cc glsl_parser.cc $(BUILT_SOURCES) builtin_function.cpp +# Only the parsers (specifically the header files generated at the same time) +# need to be in BUILT_SOURCES. Though if we list the parser headers YACC is +# called for the .c/.cpp file and the .h files. By listing the .c/.cpp files +# YACC is only executed once for each parser. The rest of the generated code +# will be created at the appropriate times according to standard automake +# dependency rules. +BUILT_SOURCES = \ + glsl_parser.cpp \ + glsl_lexer.cpp \ + glcpp/glcpp-parse.c \ + glcpp/glcpp-lex.c +CLEANFILES = \ + glcpp/glcpp-parse.h \ + glsl_parser.h \ + $(BUILT_SOURCES) -builtin_function.cpp: $(srcdir)/builtins/profiles/* $(srcdir)/builtins/ir/* $(srcdir)/builtins/glsl/* $(srcdir)/builtins/tools/generate_builtins.py $(srcdir)/builtins/tools/texture_builtins.py builtin_compiler/builtin_compiler$(BUILD_EXEEXT) - $(AM_V_GEN) $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/builtins/tools/generate_builtins.py builtin_compiler/builtin_compiler$(BUILD_EXEEXT) > builtin_function.cpp || rm -f builtin_function.cpp +builtin_function.cpp: $(srcdir)/builtins/profiles/* $(srcdir)/builtins/ir/* $(srcdir)/builtins/glsl/* $(srcdir)/builtins/tools/generate_builtins.py $(srcdir)/builtins/tools/texture_builtins.py $(builddir)/builtin_compiler/builtin_compiler$(BUILD_EXEEXT) + $(AM_V_GEN) $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/builtins/tools/generate_builtins.py $(builddir)/builtin_compiler/builtin_compiler$(BUILD_EXEEXT) > builtin_function.cpp || rm -f builtin_function.cpp diff --git a/mesalib/src/glsl/Makefile.sources b/mesalib/src/glsl/Makefile.sources index 2227c5ef5..de63c3246 100644 --- a/mesalib/src/glsl/Makefile.sources +++ b/mesalib/src/glsl/Makefile.sources @@ -6,6 +6,7 @@ GLSL_BUILDDIR = $(top_builddir)/src/glsl # libglcpp LIBGLCPP_FILES = \ + $(GLSL_SRCDIR)/ralloc.c \ $(GLSL_SRCDIR)/glcpp/pp.c LIBGLCPP_GENERATED_FILES = \ @@ -84,8 +85,7 @@ LIBGLSL_FILES = \ $(GLSL_SRCDIR)/opt_swizzle_swizzle.cpp \ $(GLSL_SRCDIR)/opt_tree_grafting.cpp \ $(GLSL_SRCDIR)/s_expression.cpp \ - $(GLSL_SRCDIR)/strtod.c \ - $(GLSL_SRCDIR)/ralloc.c + $(GLSL_SRCDIR)/strtod.c # glsl_compiler @@ -100,11 +100,11 @@ GLSL_COMPILER_CXX_FILES = \ # builtin_stubs.cpp, is used. BUILTIN_COMPILER_CXX_FILES = \ - $(GLSL_SRCDIR)/builtin_stubs.cpp + $(GLSL_SRCDIR)/builtin_compiler/builtin_stubs.cpp BUILTIN_COMPILER_GENERATED_CXX_FILES = \ - $(GLSL_BUILDDIR)/glsl_lexer.cc \ - $(GLSL_BUILDDIR)/glsl_parser.cc + $(GLSL_BUILDDIR)/glsl_lexer.cpp \ + $(GLSL_BUILDDIR)/glsl_parser.cpp # libglsl generated sources LIBGLSL_GENERATED_CXX_FILES = \ diff --git a/mesalib/src/glsl/SConscript b/mesalib/src/glsl/SConscript index 6abba2a24..6981f041b 100644 --- a/mesalib/src/glsl/SConscript +++ b/mesalib/src/glsl/SConscript @@ -76,9 +76,8 @@ else: builtin_compiler = env.Program( target = 'builtin_compiler/builtin_compiler', - source = compiler_objs + glsl_sources + [ - 'builtin_compiler/builtin_stubs.cpp', - ] + source = compiler_objs + glsl_sources + \ + source_lists['BUILTIN_COMPILER_CXX_FILES'], ) # SCons builtin dependency scanner doesn't detect that glsl_lexer.ll diff --git a/mesalib/src/glsl/builtin_compiler/Makefile.am b/mesalib/src/glsl/builtin_compiler/Makefile.am index d27aca555..1a863b228 100644 --- a/mesalib/src/glsl/builtin_compiler/Makefile.am +++ b/mesalib/src/glsl/builtin_compiler/Makefile.am @@ -40,31 +40,23 @@ AM_CFLAGS = \ AM_CXXFLAGS = $(AM_CFLAGS) -AM_YFLAGS = -v -d -p "glcpp_parser_" -AM_LFLAGS = --nounistd -o$(LEX_OUTPUT_ROOT).c - include ../Makefile.sources noinst_PROGRAMS = builtin_compiler +noinst_LTLIBRARIES = libglslcore.la libglcpp.la -builtin_compiler_SOURCES = \ - $(GLSL_SRCDIR)/glcpp/glcpp-lex.l \ - $(GLSL_SRCDIR)/glcpp/glcpp-parse.y \ - $(LIBGLCPP_FILES) \ - $(GLSL_SRCDIR)/glsl_lexer.ll \ - $(GLSL_BUILDDIR)/glsl_parser.cc \ - $(LIBGLSL_FILES) \ - $(LIBGLSL_CXX_FILES) \ - $(top_srcdir)/src/mesa/main/hash_table.c \ - $(top_srcdir)/src/mesa/program/prog_hash_table.c \ - $(top_srcdir)/src/mesa/program/symbol_table.c \ - $(GLSL_COMPILER_CXX_FILES) \ - builtin_stubs.cpp +libglcpp_la_SOURCES = \ + $(LIBGLCPP_GENERATED_FILES) \ + $(LIBGLCPP_FILES) -BUILT_SOURCES = \ - glcpp-lex.c \ - glcpp-parse.c \ - glcpp-parse.h \ - glsl_lexer.cc +libglslcore_la_SOURCES = \ + $(BUILTIN_COMPILER_GENERATED_CXX_FILES) \ + $(LIBGLSL_FILES) -CLEANFILES = $(BUILT_SOURCES) +builtin_compiler_SOURCES = \ + $(top_srcdir)/src/mesa/main/hash_table.c \ + $(top_srcdir)/src/mesa/program/prog_hash_table.c\ + $(top_srcdir)/src/mesa/program/symbol_table.c \ + $(BUILTIN_COMPILER_CXX_FILES) \ + $(GLSL_COMPILER_CXX_FILES) +builtin_compiler_LDADD = libglslcore.la libglcpp.la diff --git a/mesalib/src/glsl/glcpp/Makefile.am b/mesalib/src/glsl/glcpp/Makefile.am deleted file mode 100644 index d79f8653c..000000000 --- a/mesalib/src/glsl/glcpp/Makefile.am +++ /dev/null @@ -1,54 +0,0 @@ - -# Copyright © 2012 Jon TURNEY -# -# 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. - -include ../Makefile.sources - -TESTS = tests/glcpp-test - -AM_CFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src/mapi \ - -I$(top_srcdir)/src/mesa/ \ - $(VISIBILITY_CFLAGS) \ - $(DEFINES) \ - $(API_DEFINES) - -AM_YFLAGS = -v -d -p "glcpp_parser_" -AM_LFLAGS = --nounistd -o$(LEX_OUTPUT_ROOT).c - -noinst_LTLIBRARIES = libglcpp.la -noinst_PROGRAMS = glcpp - -libglcpp_la_SOURCES = \ - glcpp-lex.l \ - glcpp-parse.y \ - $(LIBGLCPP_FILES) - -glcpp_SOURCES = \ - ../ralloc.c \ - $(top_srcdir)/src/mesa/program/prog_hash_table.c \ - glcpp.c - -glcpp_LDADD = libglcpp.la - -BUILT_SOURCES = glcpp-lex.c glcpp-parse.c glcpp-parse.h -CLEANFILES = $(BUILT_SOURCES) diff --git a/mesalib/src/mesa/drivers/windows/gdi/wmesa.c b/mesalib/src/mesa/drivers/windows/gdi/wmesa.c index 48c6661b0..35ec65ac3 100644 --- a/mesalib/src/mesa/drivers/windows/gdi/wmesa.c +++ b/mesalib/src/mesa/drivers/windows/gdi/wmesa.c @@ -8,6 +8,7 @@ #include "GL/wmesa.h" #include <winuser.h> #include "main/context.h" +#include "main/api_exec.h" #include "main/extensions.h" #include "main/framebuffer.h" #include "main/renderbuffer.h" diff --git a/mesalib/src/mesa/main/extensions.c b/mesalib/src/mesa/main/extensions.c index fd25d31c6..5d01ac8ea 100644 --- a/mesalib/src/mesa/main/extensions.c +++ b/mesalib/src/mesa/main/extensions.c @@ -201,9 +201,9 @@ static const struct extension extension_table[] = { { "GL_EXT_subtexture", o(dummy_true), GLL, 1995 }, { "GL_EXT_texture3D", o(EXT_texture3D), GLL, 1996 }, { "GL_EXT_texture_array", o(EXT_texture_array), GL, 2006 }, - { "GL_EXT_texture_compression_dxt1", o(EXT_texture_compression_s3tc), GL | ES1 | ES2, 2004 }, - { "GL_ANGLE_texture_compression_dxt3", o(ANGLE_texture_compression_dxt), ES2, 2011 }, - { "GL_ANGLE_texture_compression_dxt5", o(ANGLE_texture_compression_dxt), ES2, 2011 }, + { "GL_EXT_texture_compression_dxt1", o(ANGLE_texture_compression_dxt), GL | ES1 | ES2, 2004 }, + { "GL_ANGLE_texture_compression_dxt3", o(ANGLE_texture_compression_dxt), GL | ES1 | ES2, 2011 }, + { "GL_ANGLE_texture_compression_dxt5", o(ANGLE_texture_compression_dxt), GL | ES1 | ES2, 2011 }, { "GL_EXT_texture_compression_latc", o(EXT_texture_compression_latc), GL, 2006 }, { "GL_EXT_texture_compression_rgtc", o(ARB_texture_compression_rgtc), GL, 2004 }, { "GL_EXT_texture_compression_s3tc", o(EXT_texture_compression_s3tc), GL, 2000 }, @@ -321,7 +321,7 @@ static const struct extension extension_table[] = { { "GL_NV_texture_barrier", o(NV_texture_barrier), GL, 2009 }, { "GL_NV_texture_env_combine4", o(NV_texture_env_combine4), GLL, 1999 }, { "GL_NV_texture_rectangle", o(NV_texture_rectangle), GLL, 2000 }, - { "GL_S3_s3tc", o(S3_s3tc), GL, 1999 }, + { "GL_S3_s3tc", o(ANGLE_texture_compression_dxt), GL, 1999 }, { "GL_SGIS_generate_mipmap", o(dummy_true), GLL, 1997 }, { "GL_SGIS_texture_border_clamp", o(ARB_texture_border_clamp), GLL, 1997 }, { "GL_SGIS_texture_edge_clamp", o(dummy_true), GLL, 1997 }, diff --git a/mesalib/src/mesa/main/glformats.c b/mesalib/src/mesa/main/glformats.c index e4f784179..6160d8ecd 100644 --- a/mesalib/src/mesa/main/glformats.c +++ b/mesalib/src/mesa/main/glformats.c @@ -867,18 +867,17 @@ _mesa_is_compressed_format(struct gl_context *ctx, GLenum format) switch (format) { case GL_COMPRESSED_RGB_S3TC_DXT1_EXT: case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT: - return ctx->Extensions.EXT_texture_compression_s3tc; case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT: case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT: - return (_mesa_is_desktop_gl(ctx) && - ctx->Extensions.EXT_texture_compression_s3tc) || - (ctx->API == API_OPENGLES2 && - ctx->Extensions.ANGLE_texture_compression_dxt); + /* Assume that the ANGLE flag will always be set if the EXT flag is set. + */ + return ctx->Extensions.ANGLE_texture_compression_dxt; case GL_RGB_S3TC: case GL_RGB4_S3TC: case GL_RGBA_S3TC: case GL_RGBA4_S3TC: - return _mesa_is_desktop_gl(ctx) && ctx->Extensions.S3_s3tc; + return _mesa_is_desktop_gl(ctx) && + ctx->Extensions.ANGLE_texture_compression_dxt; case GL_COMPRESSED_SRGB_S3TC_DXT1_EXT: case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT: case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT: diff --git a/mesalib/src/mesa/main/mtypes.h b/mesalib/src/mesa/main/mtypes.h index ead75d50e..d37e6c4c0 100644 --- a/mesalib/src/mesa/main/mtypes.h +++ b/mesalib/src/mesa/main/mtypes.h @@ -3130,7 +3130,6 @@ struct gl_extensions GLboolean NV_texture_env_combine4; GLboolean NV_texture_rectangle; GLboolean TDFX_texture_compression_FXT1; - GLboolean S3_s3tc; GLboolean OES_EGL_image; GLboolean OES_draw_texture; GLboolean OES_depth_texture_cube_map; diff --git a/mesalib/src/mesa/main/pack.c b/mesalib/src/mesa/main/pack.c index d6a97b35a..e00ae63fc 100644 --- a/mesalib/src/mesa/main/pack.c +++ b/mesalib/src/mesa/main/pack.c @@ -6022,6 +6022,11 @@ _mesa_rebase_rgba_float(GLuint n, GLfloat rgba[][4], GLenum baseFormat) rgba[i][BCOMP] = 0.0F; } break; + case GL_RGB: + for (i = 0; i < n; i++) { + rgba[i][ACOMP] = 1.0F; + } + break; default: /* no-op */ ; @@ -6060,6 +6065,11 @@ _mesa_rebase_rgba_uint(GLuint n, GLuint rgba[][4], GLenum baseFormat) rgba[i][BCOMP] = 0; } break; + case GL_RGB: + for (i = 0; i < n; i++) { + rgba[i][ACOMP] = 1; + } + break; default: /* no-op */ ; diff --git a/mesalib/src/mesa/main/texcompress.c b/mesalib/src/mesa/main/texcompress.c index 077a967da..734294e45 100644 --- a/mesalib/src/mesa/main/texcompress.c +++ b/mesalib/src/mesa/main/texcompress.c @@ -37,6 +37,7 @@ #include "formats.h" #include "mfeatures.h" #include "mtypes.h" +#include "context.h" #include "texcompress.h" #include "texcompress_fxt1.h" #include "texcompress_rgtc.h" @@ -264,7 +265,8 @@ _mesa_get_compressed_formats(struct gl_context *ctx, GLint *formats) n += 3; } } - if (ctx->Extensions.S3_s3tc) { + if (_mesa_is_desktop_gl(ctx) + && ctx->Extensions.ANGLE_texture_compression_dxt) { if (formats) { formats[n++] = GL_RGB_S3TC; formats[n++] = GL_RGB4_S3TC; diff --git a/mesalib/src/mesa/main/texformat.c b/mesalib/src/mesa/main/texformat.c index 4fb4b70f9..75b1021d4 100644 --- a/mesalib/src/mesa/main/texformat.c +++ b/mesalib/src/mesa/main/texformat.c @@ -251,7 +251,7 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target, */ if (target != GL_TEXTURE_1D && target != GL_TEXTURE_1D_ARRAY) { if (ctx->Extensions.EXT_texture_compression_s3tc || - ctx->Extensions.S3_s3tc) + ctx->Extensions.ANGLE_texture_compression_dxt) RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_DXT1); if (ctx->Extensions.TDFX_texture_compression_FXT1) RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_FXT1); @@ -264,7 +264,7 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target, /* We don't use texture compression for 1D and 1D array textures. */ if (target != GL_TEXTURE_1D && target != GL_TEXTURE_1D_ARRAY) { if (ctx->Extensions.EXT_texture_compression_s3tc || - ctx->Extensions.S3_s3tc) + ctx->Extensions.ANGLE_texture_compression_dxt) RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_DXT3); /* Not rgba_dxt1, see spec */ if (ctx->Extensions.TDFX_texture_compression_FXT1) RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FXT1); @@ -295,53 +295,81 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target, } } - if (ctx->Extensions.TDFX_texture_compression_FXT1) { - switch (internalFormat) { - case GL_COMPRESSED_RGB_FXT1_3DFX: - RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_FXT1); - break; - case GL_COMPRESSED_RGBA_FXT1_3DFX: - RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FXT1); - break; - default: - ; /* fallthrough */ - } - } - - if (ctx->Extensions.EXT_texture_compression_s3tc || - (ctx->API == API_OPENGLES2 && - ctx->Extensions.ANGLE_texture_compression_dxt)) { - switch (internalFormat) { - case GL_COMPRESSED_RGB_S3TC_DXT1_EXT: - RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_DXT1); - break; - case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT: - RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_DXT1); - break; - case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT: - RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_DXT3); - break; - case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT: - RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_DXT5); - break; - default: - ; /* fallthrough */ - } - } - - if (ctx->Extensions.S3_s3tc) { - switch (internalFormat) { - case GL_RGB_S3TC: - case GL_RGB4_S3TC: - RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_DXT1); - break; - case GL_RGBA_S3TC: - case GL_RGBA4_S3TC: - RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_DXT3); - break; - default: - ; /* fallthrough */ - } + /* For non-generic compressed format we assert two things: + * + * 1. The format has already been validated against the set of available + * extensions. + * + * 2. The driver only enables the extension if it supports all of the + * formats that are part of that extension. + */ + switch (internalFormat) { + case GL_COMPRESSED_RGB_FXT1_3DFX: + return MESA_FORMAT_RGB_FXT1; + case GL_COMPRESSED_RGBA_FXT1_3DFX: + return MESA_FORMAT_RGBA_FXT1; + case GL_COMPRESSED_RGB_S3TC_DXT1_EXT: + case GL_RGB_S3TC: + case GL_RGB4_S3TC: + return MESA_FORMAT_RGB_DXT1; + case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT: + return MESA_FORMAT_RGBA_DXT1; + case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT: + case GL_RGBA_S3TC: + case GL_RGBA4_S3TC: + return MESA_FORMAT_RGBA_DXT3; + case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT: + return MESA_FORMAT_RGBA_DXT5; + case GL_COMPRESSED_RED_RGTC1: + return MESA_FORMAT_RED_RGTC1; + case GL_COMPRESSED_SIGNED_RED_RGTC1: + return MESA_FORMAT_SIGNED_RED_RGTC1; + case GL_COMPRESSED_RG_RGTC2: + return MESA_FORMAT_RG_RGTC2; + case GL_COMPRESSED_SIGNED_RG_RGTC2: + return MESA_FORMAT_SIGNED_RG_RGTC2; + case GL_COMPRESSED_LUMINANCE_LATC1_EXT: + return MESA_FORMAT_L_LATC1; + case GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT: + return MESA_FORMAT_SIGNED_L_LATC1; + case GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT: + return MESA_FORMAT_LA_LATC2; + case GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT: + return MESA_FORMAT_SIGNED_LA_LATC2; + case GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI: + return MESA_FORMAT_LA_LATC2; + case GL_ETC1_RGB8_OES: + return MESA_FORMAT_ETC1_RGB8; + case GL_COMPRESSED_RGB8_ETC2: + return MESA_FORMAT_ETC2_RGB8; + case GL_COMPRESSED_SRGB8_ETC2: + return MESA_FORMAT_ETC2_SRGB8; + case GL_COMPRESSED_RGBA8_ETC2_EAC: + return MESA_FORMAT_ETC2_RGBA8_EAC; + case GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC: + return MESA_FORMAT_ETC2_SRGB8_ALPHA8_EAC; + case GL_COMPRESSED_R11_EAC: + return MESA_FORMAT_ETC2_R11_EAC; + case GL_COMPRESSED_RG11_EAC: + return MESA_FORMAT_ETC2_RG11_EAC; + case GL_COMPRESSED_SIGNED_R11_EAC: + return MESA_FORMAT_ETC2_SIGNED_R11_EAC; + case GL_COMPRESSED_SIGNED_RG11_EAC: + return MESA_FORMAT_ETC2_SIGNED_RG11_EAC; + case GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2: + return MESA_FORMAT_ETC2_RGB8_PUNCHTHROUGH_ALPHA1; + case GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2: + return MESA_FORMAT_ETC2_SRGB8_PUNCHTHROUGH_ALPHA1; + case GL_COMPRESSED_SRGB_S3TC_DXT1_EXT: + return MESA_FORMAT_SRGB_DXT1; + case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT: + return MESA_FORMAT_SRGBA_DXT1; + case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT: + return MESA_FORMAT_SRGBA_DXT3; + case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT: + return MESA_FORMAT_SRGBA_DXT5; + default: + ; /* fallthrough */ } if (ctx->Extensions.ARB_texture_float) { @@ -601,30 +629,6 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target, RETURN_IF_SUPPORTED(MESA_FORMAT_SRGBA8); RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8); break; - case GL_COMPRESSED_SRGB_S3TC_DXT1_EXT: - if (ctx->Extensions.EXT_texture_compression_s3tc) - RETURN_IF_SUPPORTED(MESA_FORMAT_SRGB_DXT1); - RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8); - break; - case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT: - if (ctx->Extensions.EXT_texture_compression_s3tc) - RETURN_IF_SUPPORTED(MESA_FORMAT_SRGBA_DXT1); - RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8); - break; - case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT: - if (ctx->Extensions.EXT_texture_compression_s3tc || - (ctx->API == API_OPENGLES2 && - ctx->Extensions.ANGLE_texture_compression_dxt)) - RETURN_IF_SUPPORTED(MESA_FORMAT_SRGBA_DXT3); - RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8); - break; - case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT: - if (ctx->Extensions.EXT_texture_compression_s3tc || - (ctx->API == API_OPENGLES2 && - ctx->Extensions.ANGLE_texture_compression_dxt)) - RETURN_IF_SUPPORTED(MESA_FORMAT_SRGBA_DXT5); - RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8); - break; default: ; /* fallthrough */ } @@ -920,101 +924,6 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target, } } - if (ctx->Extensions.ARB_texture_compression_rgtc) { - switch (internalFormat) { - case GL_COMPRESSED_RED_RGTC1: - RETURN_IF_SUPPORTED(MESA_FORMAT_RED_RGTC1); - break; - case GL_COMPRESSED_SIGNED_RED_RGTC1: - RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RED_RGTC1); - break; - case GL_COMPRESSED_RG_RGTC2: - RETURN_IF_SUPPORTED(MESA_FORMAT_RG_RGTC2); - break; - case GL_COMPRESSED_SIGNED_RG_RGTC2: - RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RG_RGTC2); - break; - default: - ; /* fallthrough */ - } - } - - if (ctx->Extensions.EXT_texture_compression_latc) { - switch (internalFormat) { - case GL_COMPRESSED_LUMINANCE_LATC1_EXT: - RETURN_IF_SUPPORTED(MESA_FORMAT_L_LATC1); - break; - case GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT: - RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_L_LATC1); - break; - case GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT: - RETURN_IF_SUPPORTED(MESA_FORMAT_LA_LATC2); - break; - case GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT: - RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_LA_LATC2); - break; - default: - ; /* fallthrough */ - } - } - - if (ctx->Extensions.ATI_texture_compression_3dc) { - switch (internalFormat) { - case GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI: - RETURN_IF_SUPPORTED(MESA_FORMAT_LA_LATC2); - break; - default: - ; /* fallthrough */ - } - } - - if (ctx->Extensions.OES_compressed_ETC1_RGB8_texture) { - switch (internalFormat) { - case GL_ETC1_RGB8_OES: - RETURN_IF_SUPPORTED(MESA_FORMAT_ETC1_RGB8); - break; - default: - ; /* fallthrough */ - } - } - - if (_mesa_is_gles3(ctx)) { - switch (internalFormat) { - case GL_COMPRESSED_RGB8_ETC2: - RETURN_IF_SUPPORTED(MESA_FORMAT_ETC2_RGB8); - break; - case GL_COMPRESSED_SRGB8_ETC2: - RETURN_IF_SUPPORTED(MESA_FORMAT_ETC2_SRGB8); - break; - case GL_COMPRESSED_RGBA8_ETC2_EAC: - RETURN_IF_SUPPORTED(MESA_FORMAT_ETC2_RGBA8_EAC); - break; - case GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC: - RETURN_IF_SUPPORTED(MESA_FORMAT_ETC2_SRGB8_ALPHA8_EAC); - break; - case GL_COMPRESSED_R11_EAC: - RETURN_IF_SUPPORTED(MESA_FORMAT_ETC2_R11_EAC); - break; - case GL_COMPRESSED_RG11_EAC: - RETURN_IF_SUPPORTED(MESA_FORMAT_ETC2_RG11_EAC); - break; - case GL_COMPRESSED_SIGNED_R11_EAC: - RETURN_IF_SUPPORTED(MESA_FORMAT_ETC2_SIGNED_R11_EAC); - break; - case GL_COMPRESSED_SIGNED_RG11_EAC: - RETURN_IF_SUPPORTED(MESA_FORMAT_ETC2_SIGNED_RG11_EAC); - break; - case GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2: - RETURN_IF_SUPPORTED(MESA_FORMAT_ETC2_RGB8_PUNCHTHROUGH_ALPHA1); - break; - case GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2: - RETURN_IF_SUPPORTED(MESA_FORMAT_ETC2_SRGB8_PUNCHTHROUGH_ALPHA1); - break; - default: - ; /* fallthrough */ - } - } - _mesa_problem(ctx, "unexpected format %s in _mesa_choose_tex_format()", _mesa_lookup_enum_by_nr(internalFormat)); return MESA_FORMAT_NONE; diff --git a/mesalib/src/mesa/main/teximage.c b/mesalib/src/mesa/main/teximage.c index 24a551061..31a559e9d 100644 --- a/mesalib/src/mesa/main/teximage.c +++ b/mesalib/src/mesa/main/teximage.c @@ -190,7 +190,9 @@ _mesa_base_tex_format( struct gl_context *ctx, GLint internalFormat ) } } - if (ctx->Extensions.EXT_texture_compression_s3tc) { + /* Assume that the ANGLE flag will always be set if the EXT flag is set. + */ + if (ctx->Extensions.ANGLE_texture_compression_dxt) { switch (internalFormat) { case GL_COMPRESSED_RGB_S3TC_DXT1_EXT: return GL_RGB; @@ -203,19 +205,8 @@ _mesa_base_tex_format( struct gl_context *ctx, GLint internalFormat ) } } - /* GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE && GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE */ - if (ctx->API == API_OPENGLES2 && - ctx->Extensions.ANGLE_texture_compression_dxt) { - switch (internalFormat) { - case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT: - case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT: - return GL_RGBA; - default: - ; /* fallthrough */ - } - } - - if (ctx->Extensions.S3_s3tc) { + if (_mesa_is_desktop_gl(ctx) + && ctx->Extensions.ANGLE_texture_compression_dxt) { switch (internalFormat) { case GL_RGB_S3TC: case GL_RGB4_S3TC: diff --git a/mesalib/src/mesa/state_tracker/st_extensions.c b/mesalib/src/mesa/state_tracker/st_extensions.c index 17fe16ee3..18d89815d 100644 --- a/mesalib/src/mesa/state_tracker/st_extensions.c +++ b/mesalib/src/mesa/state_tracker/st_extensions.c @@ -454,7 +454,7 @@ void st_init_extensions(struct st_context *st) PIPE_FORMAT_LATC2_SNORM } }, { { o(EXT_texture_compression_s3tc), - o(S3_s3tc) }, + o(ANGLE_texture_compression_dxt) }, { PIPE_FORMAT_DXT1_RGB, PIPE_FORMAT_DXT1_RGBA, PIPE_FORMAT_DXT3_RGBA, @@ -611,7 +611,7 @@ void st_init_extensions(struct st_context *st) if (!ctx->Mesa_DXTn && !st_get_s3tc_override()) { ctx->Extensions.EXT_texture_compression_s3tc = GL_FALSE; - ctx->Extensions.S3_s3tc = GL_FALSE; + ctx->Extensions.ANGLE_texture_compression_dxt = GL_FALSE; } if (screen->get_shader_param(screen, PIPE_SHADER_GEOMETRY, diff --git a/mesalib/src/mesa/swrast/s_blit.c b/mesalib/src/mesa/swrast/s_blit.c index 3a4e7eec0..82fa43f1c 100644 --- a/mesalib/src/mesa/swrast/s_blit.c +++ b/mesalib/src/mesa/swrast/s_blit.c @@ -188,29 +188,6 @@ blit_nearest(struct gl_context *ctx, return; } - /* choose row resampler */ - switch (pixelSize) { - case 1: - resampleRow = resample_row_1; - break; - case 2: - resampleRow = resample_row_2; - break; - case 4: - resampleRow = resample_row_4; - break; - case 8: - resampleRow = resample_row_8; - break; - case 16: - resampleRow = resample_row_16; - break; - default: - _mesa_problem(ctx, "unexpected pixel size (%d) in blit_nearest", - pixelSize); - return; - } - /* Blit to all the draw buffers */ for (i = 0; i < numDrawBuffers; i++) { if (buffer == GL_COLOR_BUFFER_BIT) { @@ -232,6 +209,29 @@ blit_nearest(struct gl_context *ctx, } } + /* choose row resampler */ + switch (pixelSize) { + case 1: + resampleRow = resample_row_1; + break; + case 2: + resampleRow = resample_row_2; + break; + case 4: + resampleRow = resample_row_4; + break; + case 8: + resampleRow = resample_row_8; + break; + case 16: + resampleRow = resample_row_16; + break; + default: + _mesa_problem(ctx, "unexpected pixel size (%d) in blit_nearest", + pixelSize); + return; + } + if ((readRb == drawRb) || (readAtt->Texture && drawAtt->Texture && (readAtt->Texture == drawAtt->Texture))) { @@ -304,7 +304,8 @@ blit_nearest(struct gl_context *ctx, } for (dstRow = 0; dstRow < dstHeight; dstRow++) { - GLint srcRow = (dstRow * srcHeight) / dstHeight; + GLfloat srcRowF = (dstRow + 0.5F) / dstHeight * srcHeight - 0.5F; + GLint srcRow = IROUND(srcRowF); GLubyte *dstRowStart = dstMap + dstRowStride * dstRow; ASSERT(srcRow >= 0); @@ -347,7 +348,7 @@ blit_nearest(struct gl_context *ctx, /* store pixel row in destination */ switch (mode) { case DIRECT: - memcpy(dstRowStart, dstBuffer, pixelSize * srcWidth); + memcpy(dstRowStart, dstBuffer, pixelSize * dstWidth); break; case UNPACK_RGBA_FLOAT: _mesa_pack_float_rgba_row(drawRb->Format, dstWidth, dstBuffer, @@ -404,17 +405,15 @@ resample_linear_row_ub(GLint srcWidth, GLint dstWidth, const GLubyte (*srcColor0)[4] = (const GLubyte (*)[4]) srcBuffer0; const GLubyte (*srcColor1)[4] = (const GLubyte (*)[4]) srcBuffer1; GLubyte (*dstColor)[4] = (GLubyte (*)[4]) dstBuffer; - const GLfloat dstWidthF = (GLfloat) dstWidth; GLint dstCol; for (dstCol = 0; dstCol < dstWidth; dstCol++) { - const GLfloat srcCol = (dstCol * srcWidth) / dstWidthF; - GLint srcCol0 = IFLOOR(srcCol); + const GLfloat srcCol = (dstCol + 0.5F) / dstWidth * srcWidth - 0.5F; + GLint srcCol0 = MAX2(0, IFLOOR(srcCol)); GLint srcCol1 = srcCol0 + 1; GLfloat colWeight = srcCol - srcCol0; /* fractional part of srcCol */ GLfloat red, green, blue, alpha; - ASSERT(srcCol0 >= 0); ASSERT(srcCol0 < srcWidth); ASSERT(srcCol1 <= srcWidth); @@ -461,17 +460,15 @@ resample_linear_row_float(GLint srcWidth, GLint dstWidth, const GLfloat (*srcColor0)[4] = (const GLfloat (*)[4]) srcBuffer0; const GLfloat (*srcColor1)[4] = (const GLfloat (*)[4]) srcBuffer1; GLfloat (*dstColor)[4] = (GLfloat (*)[4]) dstBuffer; - const GLfloat dstWidthF = (GLfloat) dstWidth; GLint dstCol; for (dstCol = 0; dstCol < dstWidth; dstCol++) { - const GLfloat srcCol = (dstCol * srcWidth) / dstWidthF; - GLint srcCol0 = IFLOOR(srcCol); + const GLfloat srcCol = (dstCol + 0.5F) / dstWidth * srcWidth - 0.5F; + GLint srcCol0 = MAX2(0, IFLOOR(srcCol)); GLint srcCol1 = srcCol0 + 1; GLfloat colWeight = srcCol - srcCol0; /* fractional part of srcCol */ GLfloat red, green, blue, alpha; - ASSERT(srcCol0 >= 0); ASSERT(srcCol0 < srcWidth); ASSERT(srcCol1 <= srcWidth); @@ -526,7 +523,6 @@ blit_linear(struct gl_context *ctx, const GLint dstWidth = ABS(dstX1 - dstX0); const GLint srcHeight = ABS(srcY1 - srcY0); const GLint dstHeight = ABS(dstY1 - dstY0); - const GLfloat dstHeightF = (GLfloat) dstHeight; const GLint srcXpos = MIN2(srcX0, srcX1); const GLint srcYpos = MIN2(srcY0, srcY1); @@ -654,14 +650,11 @@ blit_linear(struct gl_context *ctx, for (dstRow = 0; dstRow < dstHeight; dstRow++) { const GLint dstY = dstYpos + dstRow; - const GLfloat srcRow = (dstRow * srcHeight) / dstHeightF; - GLint srcRow0 = IFLOOR(srcRow); + GLfloat srcRow = (dstRow + 0.5F) / dstHeight * srcHeight - 0.5F; + GLint srcRow0 = MAX2(0, IFLOOR(srcRow)); GLint srcRow1 = srcRow0 + 1; GLfloat rowWeight = srcRow - srcRow0; /* fractional part of srcRow */ - ASSERT(srcRow >= 0); - ASSERT(srcRow < srcHeight); - if (srcRow1 == srcHeight) { /* last row fudge */ srcRow1 = srcRow0; |