[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-
|
From: |
Benjamin Wolsey |
|
Subject: |
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-273-g76555ba |
|
Date: |
Mon, 14 Mar 2011 10:01:30 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".
The branch, master has been updated
via 76555bab996cf2c3a16eb8334f5ee879cb1b40b8 (commit)
from 037121c44fad56895bc5a83c46767177ec0a0340 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=76555bab996cf2c3a16eb8334f5ee879cb1b40b8
commit 76555bab996cf2c3a16eb8334f5ee879cb1b40b8
Author: Andrew Guertin <address@hidden>
Date: Mon Mar 14 11:02:19 2011 +0100
Remove obsolete fix-lod-bias option.
diff --git a/configure.ac b/configure.ac
index e9af519..7dc3c92 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1563,21 +1563,6 @@ if test x"${cgibin}" = x"yes"; then
fi
dnl --------------------------------------------------------
-dnl Fix the Intel 810 LOD bias problem
-dnl --------------------------------------------------------
-AC_ARG_ENABLE(i810-lod-bias,
- AC_HELP_STRING([--enable-i810-lod-bias], [Enable fix for Intel 810 LOD bias
problem]),
-[case "${enableval}" in
- yes) i810lodbias=yes ;;
- no) i810lodbias=no ;;
- *) AC_MSG_ERROR([bad value ${enableval} for enable-i810-lod-bias option])
;;
-esac])
-
-if test x"${i810lodbias}" = xyes; then
- AC_DEFINE([FIX_I810_LOD_BIAS], [], [Fix i810 LOD bias problem])
-fi
-
-dnl --------------------------------------------------------
dnl Double buffer
dnl --------------------------------------------------------
dnl Add an option for double buffering when rendering, currently only used by
@@ -3021,12 +3006,6 @@ exec 5> $crec
echo "Configurable options are:"
-if test x"${i810lodbias}" = x"yes"; then
- echo " Intel 810 LOD bias hack enabled"
-else
- echo " Intel 810 LOD bias hack disabled (default). Use
--enable-i810-lod-bias to enable."
-fi
-
if test x"${pthreads}" = x"yes"; then
echo " POSIX Threads support enabled (default)"
else
diff --git a/doc/C/refmanual/feature_configuration.xml
b/doc/C/refmanual/feature_configuration.xml
index 19d9024..63cdeb5 100644
--- a/doc/C/refmanual/feature_configuration.xml
+++ b/doc/C/refmanual/feature_configuration.xml
@@ -153,14 +153,6 @@
</entry>
</row>
<row>
- <entry><option>--enable-i810-lod-bias</option>
- </entry>
- <entry>Enable fix for Intel 810 LOD bias problem. Older versions
- of libMesa on the Intel i810 or i815 graphics processor
- need this flag or Gnash will core dump. This has been
- fixed in newer versions (summer 2005) of libMesa.</entry>
- </row>
- <row>
<entry><option>--enable-media=ffmpeg|gst|none</option>
</entry>
<entry> <para>
diff --git a/gui/aqua/aqua_ogl_glue.cpp b/gui/aqua/aqua_ogl_glue.cpp
index 9d2e9e6..d184f12 100644
--- a/gui/aqua/aqua_ogl_glue.cpp
+++ b/gui/aqua/aqua_ogl_glue.cpp
@@ -28,9 +28,6 @@ namespace gnash
AquaOglGlue::AquaOglGlue()
: _context(NULL)
-#ifdef FIX_I810_LOD_BIAS
- ,_tex_lod_bias(-1.2f)
-#endif
{
// GNASH_REPORT_FUNCTION;
@@ -46,12 +43,6 @@ AquaOglGlue::~AquaOglGlue()
bool AquaOglGlue::init(int argc, char **argv[])
{
// GNASH_REPORT_FUNCTION;
-#ifdef FIX_I810_LOD_BIAS
- int c = getopt (argc, *argv, "m:");
- if (c == 'm') {
- _tex_lod_bias = (float) strtof(optarg, NULL);
- }
-#endif
const GLint glattribs[] = { AGL_RGBA, AGL_ACCELERATED,
AGL_DEPTH_SIZE, 32,
@@ -80,9 +71,6 @@ Renderer* AquaOglGlue::createRenderHandler()
{
// GNASH_REPORT_FUNCTION;
Renderer* renderer = create_Renderer_ogl();
-#ifdef FIX_I810_LOD_BIAS
- glTexEnvf(GL_TEXTURE_FILTER_CONTROL_EXT, GL_TEXTURE_LOD_BIAS_EXT,
_tex_lod_bias);
-#endif
return renderer;
}
diff --git a/gui/aqua/aqua_ogl_glue.h b/gui/aqua/aqua_ogl_glue.h
index dbffea1..41773f9 100644
--- a/gui/aqua/aqua_ogl_glue.h
+++ b/gui/aqua/aqua_ogl_glue.h
@@ -38,9 +38,6 @@ class AquaOglGlue : public AquaGlue
void setInvalidatedRegions(const InvalidatedRanges& /* ranges */);
void render();
private:
-#ifdef FIX_I810_LOD_BIAS
- float _tex_lod_bias;
-#endif
AGLContext _context;
};
}
diff --git a/gui/aqua/aquasup.h b/gui/aqua/aquasup.h
index ad5493d..e364a76 100644
--- a/gui/aqua/aquasup.h
+++ b/gui/aqua/aquasup.h
@@ -52,9 +52,6 @@ class DSOEXPORT AquaGui : public Gui
#if defined(RENDERER_OPENGL)
AquaOglGlue _glue;
-#ifdef FIX_I810_LOD_BIAS
- float _tex_lod_bias;
-#endif
#endif
public:
diff --git a/gui/gtk/gtk_glue_gtkglext.cpp b/gui/gtk/gtk_glue_gtkglext.cpp
index 34aab00..39b68c5 100644
--- a/gui/gtk/gtk_glue_gtkglext.cpp
+++ b/gui/gtk/gtk_glue_gtkglext.cpp
@@ -31,9 +31,6 @@ namespace gnash
{
GtkGlExtGlue::GtkGlExtGlue()
-#ifdef FIX_I810_LOD_BIAS
- : _tex_lod_bias(-1.2f)
-#endif
{
GNASH_REPORT_FUNCTION;
}
@@ -57,12 +54,6 @@ bool
GtkGlExtGlue::init(int argc, char** argv[])
{
// GNASH_REPORT_FUNCTION;
-#ifdef FIX_I810_LOD_BIAS
- int c = getopt (argc, *argv, "m:");
- if (c == 'm') {
- _tex_lod_bias = (float) strtof(optarg, NULL);
- }
-#endif
gtk_gl_init (&argc, argv);
@@ -118,10 +109,6 @@ GtkGlExtGlue::createRenderHandler()
Renderer* renderer = create_Renderer_ogl();
-#ifdef FIX_I810_LOD_BIAS
- glTexEnvf(GL_TEXTURE_FILTER_CONTROL_EXT, GL_TEXTURE_LOD_BIAS_EXT,
_tex_lod_bias);
-#endif
-
return renderer;
}
diff --git a/gui/gtk/gtk_glue_gtkglext.h b/gui/gtk/gtk_glue_gtkglext.h
index c6b721d..680f6ef 100644
--- a/gui/gtk/gtk_glue_gtkglext.h
+++ b/gui/gtk/gtk_glue_gtkglext.h
@@ -50,9 +50,6 @@ class GtkGlExtGlue : public GtkGlue
void configure(GtkWidget *const widget, GdkEventConfigure *const event);
private:
GdkGLConfig *_glconfig;
-#ifdef FIX_I810_LOD_BIAS
- float _tex_lod_bias;
-#endif
};
} // end of gnash namespace
diff --git a/gui/kde/kde_glue_opengl.cpp b/gui/kde/kde_glue_opengl.cpp
index f1171f4..db4072c 100644
--- a/gui/kde/kde_glue_opengl.cpp
+++ b/gui/kde/kde_glue_opengl.cpp
@@ -26,9 +26,6 @@ namespace gnash
{
KdeOpenGLGlue::KdeOpenGLGlue()
-#ifdef FIX_I810_LOD_BIAS
- : _tex_lod_bias(-1.2f)
-#endif
{
}
@@ -40,13 +37,6 @@ bool
KdeOpenGLGlue::init(int argc, char **argv[])
{
// GNASH_REPORT_FUNCTION;
-
-#ifdef FIX_I810_LOD_BIAS
- int c = getopt (argc, *argv, "m:");
- if (c == 'm') {
- _tex_lod_bias = (float) strtof(optarg, NULL);
- }
-#endif
return true;
}
@@ -65,9 +55,6 @@ KdeOpenGLGlue::createRenderHandler()
// GNASH_REPORT_FUNCTION;
Renderer* renderer = create_Renderer_ogl();
-#ifdef FIX_I810_LOD_BIAS
- glTexEnvf(GL_TEXTURE_FILTER_CONTROL_EXT, GL_TEXTURE_LOD_BIAS_EXT,
_tex_lod_bias);
-#endif
return renderer;
}
diff --git a/gui/kde/kde_glue_opengl.h b/gui/kde/kde_glue_opengl.h
index 1ef3ac0..2f2305f 100644
--- a/gui/kde/kde_glue_opengl.h
+++ b/gui/kde/kde_glue_opengl.h
@@ -35,10 +35,6 @@ class KdeOpenGLGlue : public KdeGlue
void prepDrawingArea(QWidget *drawing_area);
Renderer* createRenderHandler();
void render();
- private:
-#ifdef FIX_I810_LOD_BIAS
- float _tex_lod_bias;
-#endif
};
}
diff --git a/gui/sdl/sdl_ogl_glue.cpp b/gui/sdl/sdl_ogl_glue.cpp
index 2045ae6..67cbdc9 100644
--- a/gui/sdl/sdl_ogl_glue.cpp
+++ b/gui/sdl/sdl_ogl_glue.cpp
@@ -32,9 +32,6 @@ namespace gnash
{
SdlOglGlue::SdlOglGlue()
-#ifdef FIX_I810_LOD_BIAS
- : _tex_lod_bias(-1.2f)
-#endif
{
// GNASH_REPORT_FUNCTION;
}
@@ -48,13 +45,6 @@ SdlOglGlue::~SdlOglGlue()
bool SdlOglGlue::init(int /*argc*/, char ** /*argv*/ [])
{
// GNASH_REPORT_FUNCTION;
-#ifdef FIX_I810_LOD_BIAS
- int c = getopt (argc, *argv, "m:");
- if (c == 'm') {
- _tex_lod_bias = (float) strtof(optarg, NULL);
- }
-#endif
-
return true;
}
@@ -68,10 +58,6 @@ SdlOglGlue::createRenderHandler(int depth)
Renderer* renderer = create_Renderer_ogl();
-#ifdef FIX_I810_LOD_BIAS
- glTexEnvf(GL_TEXTURE_FILTER_CONTROL_EXT, GL_TEXTURE_LOD_BIAS_EXT,
_tex_lod_bias);
-#endif
-
return renderer;
}
@@ -128,10 +114,6 @@ SdlOglGlue::prepDrawingArea(int width, int height,
boost::uint32_t sdl_flags)
glDisable(GL_LIGHTING);
glPushAttrib (GL_ALL_ATTRIB_BITS);
-# ifdef FIX_I810_LOD_BIAS
- glTexEnvf(GL_TEXTURE_FILTER_CONTROL_EXT, GL_TEXTURE_LOD_BIAS_EXT,
_tex_lod_bias);
-# endif
-
return true;
}
diff --git a/gui/sdl/sdl_ogl_glue.h b/gui/sdl/sdl_ogl_glue.h
index 22175d9..852ad40 100644
--- a/gui/sdl/sdl_ogl_glue.h
+++ b/gui/sdl/sdl_ogl_glue.h
@@ -35,10 +35,6 @@ class SdlOglGlue : public SdlGlue
void setInvalidatedRegions(const InvalidatedRanges& ranges);
bool prepDrawingArea(int width, int height, boost::uint32_t sdl_flags);
void render();
- private:
-#ifdef FIX_I810_LOD_BIAS
- float _tex_lod_bias;
-#endif
};
}
diff --git a/gui/sdl/sdlsup.h b/gui/sdl/sdlsup.h
index 4718730..1dc4f08 100644
--- a/gui/sdl/sdlsup.h
+++ b/gui/sdl/sdlsup.h
@@ -85,9 +85,6 @@ private:
SdlCairoGlue _glue;
#elif defined(RENDERER_OPENGL)
SdlOglGlue _glue;
-# ifdef FIX_I810_LOD_BIAS
- float _tex_lod_bias;
-# endif
#endif
};
diff --git a/librender/opengl/Renderer_ogl.cpp
b/librender/opengl/Renderer_ogl.cpp
index 7c68c87..266eabc 100644
--- a/librender/opengl/Renderer_ogl.cpp
+++ b/librender/opengl/Renderer_ogl.cpp
@@ -744,21 +744,6 @@ public:
glMatrixMode(GL_MODELVIEW);
glLoadIdentity();
-
-#ifdef FIX_I810_LOD_BIAS
- // If 2D textures weren't previously enabled, enable
- // them now and force the driver to notice the update,
- // then disable them again.
- if (!glIsEnabled(GL_TEXTURE_2D)) {
- // Clearing a mask of zero *should* have no
- // side effects, but coupled with enbling
- // GL_TEXTURE_2D it works around a segmentation
- // fault in the driver for the Intel 810 chip.
- oglScopeEnable enabler(GL_TEXTURE_2D);
- glClear(0);
- }
-#endif
-
glShadeModel(GL_FLAT);
}
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 21 ---------------------
doc/C/refmanual/feature_configuration.xml | 8 --------
gui/aqua/aqua_ogl_glue.cpp | 12 ------------
gui/aqua/aqua_ogl_glue.h | 3 ---
gui/aqua/aquasup.h | 3 ---
gui/gtk/gtk_glue_gtkglext.cpp | 13 -------------
gui/gtk/gtk_glue_gtkglext.h | 3 ---
gui/kde/kde_glue_opengl.cpp | 13 -------------
gui/kde/kde_glue_opengl.h | 4 ----
gui/sdl/sdl_ogl_glue.cpp | 18 ------------------
gui/sdl/sdl_ogl_glue.h | 4 ----
gui/sdl/sdlsup.h | 3 ---
librender/opengl/Renderer_ogl.cpp | 15 ---------------
13 files changed, 0 insertions(+), 120 deletions(-)
hooks/post-receive
--
Gnash
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-273-g76555ba,
Benjamin Wolsey <=