diff --git a/src/platform/AmigaOS/agg_platform_support.cpp b/src/platform/AmigaOS/agg_platform_support.cpp index 3aab224..62f0074 100644 --- a/src/platform/AmigaOS/agg_platform_support.cpp +++ b/src/platform/AmigaOS/agg_platform_support.cpp @@ -49,6 +49,10 @@ KeymapIFace* IKeymap = 0; Class* RequesterClass = 0; Class* WindowClass = 0; +struct RenderInfo { + APTR Memory; + UWORD BytesPerRow; +}; namespace agg { @@ -68,7 +72,7 @@ namespace agg bool make_bitmap(); public: platform_support& m_support; - RGBFTYPE m_ftype; + enPixelFormat m_ftype; pix_format_e m_format; unsigned m_bpp; BitMap* m_bitmap; @@ -89,7 +93,7 @@ namespace agg platform_specific::platform_specific(platform_support& support, pix_format_e format, bool flip_y) : m_support(support), - m_ftype(RGBFB_NONE), + m_ftype(PIXF_NONE), m_format(format), m_bpp(0), m_bitmap(0), @@ -110,35 +114,35 @@ namespace agg // Not supported. break; case pix_format_rgb555: - m_ftype = RGBFB_R5G5B5; + m_ftype = PIXF_R5G5B5; m_bpp = 15; break; case pix_format_rgb565: - m_ftype = RGBFB_R5G6B5; + m_ftype = PIXF_R5G6B5; m_bpp = 16; break; case pix_format_rgb24: - m_ftype = RGBFB_R8G8B8; + m_ftype = PIXF_R8G8B8; m_bpp = 24; break; case pix_format_bgr24: - m_ftype = RGBFB_B8G8R8; + m_ftype = PIXF_B8G8R8; m_bpp = 24; break; case pix_format_bgra32: - m_ftype = RGBFB_B8G8R8A8; + m_ftype = PIXF_B8G8R8A8; m_bpp = 32; break; case pix_format_abgr32: - m_ftype = RGBFB_A8B8G8R8; + m_ftype = PIXF_A8B8G8R8; m_bpp = 32; break; case pix_format_argb32: - m_ftype = RGBFB_A8R8G8B8; + m_ftype = PIXF_A8R8G8B8; m_bpp = 32; break; case pix_format_rgba32: - m_ftype = RGBFB_R8G8B8A8; + m_ftype = PIXF_R8G8B8A8; m_bpp = 32; break; } @@ -236,12 +240,12 @@ namespace agg bool supported = false; - RGBFTYPE ftype = static_cast(IGraphics->GetBitMapAttr( + enPixelFormat ftype = static_cast(IGraphics->GetBitMapAttr( src_bitmap, BMA_PIXELFORMAT)); switch ( ftype ) { - case RGBFB_R8G8B8: + case PIXF_R8G8B8: supported = true; break; default: @@ -492,7 +496,7 @@ namespace agg bool platform_support::init(unsigned width, unsigned height, unsigned flags) { - if( m_specific->m_ftype == RGBFB_NONE ) + if( m_specific->m_ftype == PIXF_NONE ) { message("Unsupported mode requested."); return false; @@ -551,14 +555,14 @@ namespace agg return false; } - RGBFTYPE ftype = static_cast(IGraphics->GetBitMapAttr( + enPixelFormat ftype = static_cast(IGraphics->GetBitMapAttr( m_specific->m_window->RPort->BitMap, BMA_PIXELFORMAT)); switch ( ftype ) { - case RGBFB_A8R8G8B8: - case RGBFB_B8G8R8A8: - case RGBFB_R5G6B5PC: + case PIXF_A8R8G8B8: + case PIXF_B8G8R8A8: + case PIXF_R5G6B5PC: break; default: message("Unsupported screen mode.\n");