[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog backend/render_handler.h backen...
|
From: |
Bastiaan Jacques |
|
Subject: |
[Gnash-commit] gnash ChangeLog backend/render_handler.h backen... |
|
Date: |
Mon, 03 Dec 2007 05:29:35 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Bastiaan Jacques <bjacques> 07/12/03 05:29:35
Modified files:
. : ChangeLog
backend : render_handler.h render_handler_agg.cpp
render_handler_cairo.cpp render_handler_ogl.cpp
server : render.cpp render.h
Log message:
* backend/render_handler{.h,_ogl.cpp,_agg.cpp,_cairo.cpp},
server/render.{h,cpp}: Drop allow_glyph_textures and draw_bitmap
because the glyph texturing code was removed from the Gnash core
recently. (This was the only purpose for draw_bitmap.)
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5058&r2=1.5059
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler.h?cvsroot=gnash&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_agg.cpp?cvsroot=gnash&r1=1.120&r2=1.121
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_cairo.cpp?cvsroot=gnash&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_ogl.cpp?cvsroot=gnash&r1=1.99&r2=1.100
http://cvs.savannah.gnu.org/viewcvs/gnash/server/render.cpp?cvsroot=gnash&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/gnash/server/render.h?cvsroot=gnash&r1=1.19&r2=1.20
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5058
retrieving revision 1.5059
diff -u -b -r1.5058 -r1.5059
--- ChangeLog 3 Dec 2007 00:22:04 -0000 1.5058
+++ ChangeLog 3 Dec 2007 05:29:33 -0000 1.5059
@@ -1,3 +1,10 @@
+2007-12-02 Bastiaan Jacques <address@hidden>
+
+ * backend/render_handler{.h,_ogl.cpp,_agg.cpp,_cairo.cpp},
+ server/render.{h,cpp}: Drop allow_glyph_textures and draw_bitmap
+ because the glyph texturing code was removed from the Gnash core
+ recently. (This was the only purpose for draw_bitmap.)
+
2007-12-02 Rob Savoye <address@hidden>
* Makefile.am: Add target to build ipk packages.
Index: backend/render_handler.h
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler.h,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- backend/render_handler.h 2 Dec 2007 01:06:30 -0000 1.53
+++ backend/render_handler.h 3 Dec 2007 05:29:34 -0000 1.54
@@ -18,7 +18,7 @@
//
//
-/* $Id: render_handler.h,v 1.53 2007/12/02 01:06:30 bjacques Exp $ */
+/* $Id: render_handler.h,v 1.54 2007/12/03 05:29:34 bjacques Exp $ */
#ifndef RENDER_HANDLER_H
#define RENDER_HANDLER_H
@@ -376,19 +376,6 @@
WRAP_CLAMP
};
-
- /// Special function to draw a rectangular bitmap.
- //
- /// Intended for textured glyph rendering. Ignores
- /// current transforms.
- ///
- virtual void draw_bitmap(
- const matrix& m,
- const bitmap_info* bi,
- const rect& coords,
- const rect& uv_coords,
- const rgba& color) = 0;
-
virtual void set_antialiased(bool enable) = 0;
///@{ Masks
@@ -511,13 +498,6 @@
virtual void draw_glyph(shape_character_def *def, const matrix& mat,
const rgba& color, float pixel_scale) = 0;
- /// The render handler can choose if it wishes to use textured glyphs
- /// (pre-computed bitmaps which are used for small text sizes) or if
- /// draw_glyph() should be used in any case. When glyph textures are not
- /// desired, then draw_bitmap() is never called in the *current* version.
- virtual bool allow_glyph_textures() = 0;
-
-
/// This function returns the color at any position in the stage. It is used
/// for automatic testing only, it should not be used for anything else!
/// x and y are pixel coordinates (<0 won't make any sense) and the color of
Index: backend/render_handler_agg.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_agg.cpp,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -b -r1.120 -r1.121
--- backend/render_handler_agg.cpp 2 Dec 2007 01:06:30 -0000 1.120
+++ backend/render_handler_agg.cpp 3 Dec 2007 05:29:34 -0000 1.121
@@ -17,7 +17,7 @@
-/* $Id: render_handler_agg.cpp,v 1.120 2007/12/02 01:06:30 bjacques Exp $ */
+/* $Id: render_handler_agg.cpp,v 1.121 2007/12/03 05:29:34 bjacques Exp $ */
// Original version by Udo Giacomozzi and Hannes Mayr,
// INDUNET GmbH (www.indunet.it)
@@ -685,11 +685,6 @@
}
}
- bool allow_glyph_textures() {
- // We want to render all glyphs in place
- return false;
- }
-
void end_display()
// Clean up after rendering a frame. Client program is still
// responsible for calling glSwapBuffers() or whatever.
@@ -813,22 +808,6 @@
} // draw_line_strip
- void draw_bitmap(
- const gnash::matrix& /*m*/,
- const gnash::bitmap_info* /*bi*/,
- const gnash::rect& /*coords*/,
- const gnash::rect& /*uv_coords*/,
- const gnash::rgba& /*color*/)
- // Draw a rectangle textured with the given bitmap, with the
- // given color. Apply given transform; ignore any currently
- // set transforms.
- //
- // Intended for textured glyph rendering.
- {
- log_msg(" draw_bitmap NOT IMPLEMENTED\n");
- // could be implemented, but is not used
- }
-
void begin_submit_mask()
{
// Set flag so that rendering of shapes is simplified (only solid fill)
Index: backend/render_handler_cairo.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_cairo.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- backend/render_handler_cairo.cpp 2 Dec 2007 01:06:31 -0000 1.34
+++ backend/render_handler_cairo.cpp 3 Dec 2007 05:29:34 -0000 1.35
@@ -391,16 +391,6 @@
cairo_new_path(_cr);
}
- virtual void draw_bitmap(
- const matrix& m,
- const bitmap_info* bi,
- const rect& coords,
- const rect& uv_coords,
- const rgba& color)
- {
- log_unimpl("draw_bitmap");
- }
-
virtual void set_antialiased(bool enable)
{
log_unimpl("set_antialiased");
@@ -874,11 +864,6 @@
destroy_cairo_patterns(fill_styles_cairo);
}
- virtual bool allow_glyph_textures()
- {
- return false;
- }
-
void
set_context(cairo_t* context)
{
Index: backend/render_handler_ogl.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_ogl.cpp,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -b -r1.99 -r1.100
--- backend/render_handler_ogl.cpp 2 Dec 2007 01:06:31 -0000 1.99
+++ backend/render_handler_ogl.cpp 3 Dec 2007 05:29:34 -0000 1.100
@@ -899,16 +899,6 @@
log_unimpl("draw_poly");
}
- virtual void draw_bitmap(
- const matrix& m,
- const bitmap_info* bi,
- const rect& coords,
- const rect& uv_coords,
- const rgba& color)
- {
- log_unimpl("draw_bitmap");
- }
-
virtual void set_antialiased(bool enable)
{
log_unimpl("set_antialiased");
@@ -1625,11 +1615,6 @@
glPopMatrix();
}
- virtual bool allow_glyph_textures()
- {
- return false;
- }
-
virtual void set_scale(float xscale, float yscale) {
_xscale = xscale;
_yscale = yscale;
Index: server/render.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/render.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- server/render.cpp 2 Dec 2007 01:06:31 -0000 1.21
+++ server/render.cpp 3 Dec 2007 05:29:34 -0000 1.22
@@ -173,14 +173,6 @@
if (s_render_handler) s_render_handler->draw_glyph(def,
mat, color, pixel_scale);
}
-
- bool allow_glyph_textures() {
- if (s_render_handler)
- return s_render_handler->allow_glyph_textures();
- else
- return true;
- }
-
bool bounds_in_clipping_area(const rect& bounds) {
return bounds_in_clipping_area(bounds.getRange());
if (s_render_handler)
@@ -229,21 +221,6 @@
#endif
if (s_render_handler) s_render_handler->disable_mask();
}
-
- // Special function to draw a rectangular bitmap;
- // intended for textured glyph rendering. Ignores
- // current transforms.
- void draw_bitmap(const matrix& m, const bitmap_info* bi,
const rect& coords, const rect& uv_coords, const rgba& color)
- {
-#ifdef DEBUG_RENDER_CALLS
- GNASH_REPORT_FUNCTION;
-#endif
- if (s_render_handler)
- {
- s_render_handler->draw_bitmap(
- m, bi, coords, uv_coords, color);
- }
- }
}
}
Index: server/render.h
===================================================================
RCS file: /sources/gnash/gnash/server/render.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- server/render.h 2 Dec 2007 01:06:31 -0000 1.19
+++ server/render.h 3 Dec 2007 05:29:35 -0000 1.20
@@ -104,9 +104,6 @@
void draw_glyph(shape_character_def *def, const matrix& mat,
const rgba& color, float pixel_scale);
- /// See render_handler::allow_glyph_textures (in
backend/render_handler.h)
- bool allow_glyph_textures();
-
/// See render_handler::bounds_in_clipping_area (in
backend/render_handler.h)
bool bounds_in_clipping_area(const rect& bounds);
bool bounds_in_clipping_area(const InvalidatedRanges& ranges);
@@ -121,11 +118,6 @@
/// See render_handler::disable_mask (in
backend/render_handler.h)
void disable_mask();
- /// See render_handler::draw_bitmap (in
backend/render_handler.h)
- void draw_bitmap(const matrix& m, const bitmap_info* bi,
- const rect& coords,
- const rect& uv_coords, const rgba& color);
-
} // end namespace render
} // end namespace gnash