diff options
Diffstat (limited to 'dev/modules/CoreGfx/CoreGfx.h')
| -rw-r--r-- | dev/modules/CoreGfx/CoreGfx.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/dev/modules/CoreGfx/CoreGfx.h b/dev/modules/CoreGfx/CoreGfx.h index 74326f16..6df2329b 100644 --- a/dev/modules/CoreGfx/CoreGfx.h +++ b/dev/modules/CoreGfx/CoreGfx.h @@ -8,20 +8,20 @@ #include <NewKit/Defines.h> -#define fb_init() Kernel::SizeT kCGCursor = 0 +#define fb_init() Kernel::UInt32 kCGCursor = 0 #define fb_color(R, G, B) RGB(R, G, B) -#define fb_get_clear_clr() fb_color(0x20, 0x20, 0x20) +#define fb_get_clear_clr() RGB(0x20, 0x20, 0x20) #define fb_clear() kCGCursor = 0UL #ifdef __NE_AMD64__ /// @brief Performs Alpha drawing on the framebuffer. #define FBDrawBitMapInRegionA(reg_ptr, height, width, base_x, base_y) \ - for (Kernel::SizeT i = base_x; i < (width + base_x); ++i) \ + for (Kernel::UInt32 i = base_x; i < (width + base_x); ++i) \ { \ - for (Kernel::SizeT u = base_y; u < (height + base_y); ++u) \ + for (Kernel::UInt32 u = base_y; u < (height + base_y); ++u) \ { \ *(((Kernel::UInt32*)(kHandoverHeader->f_GOP.f_The + \ 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \ @@ -34,9 +34,9 @@ /// @brief Performs drawing on the framebuffer. #define FBDrawBitMapInRegion(reg_ptr, height, width, base_x, base_y) \ - for (Kernel::SizeT i = base_x; i < (width + base_x); ++i) \ + for (Kernel::UInt32 i = base_x; i < (width + base_x); ++i) \ { \ - for (Kernel::SizeT u = base_y; u < (height + base_y); ++u) \ + for (Kernel::UInt32 u = base_y; u < (height + base_y); ++u) \ { \ *(((Kernel::UInt32*)(kHandoverHeader->f_GOP.f_The + \ 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \ @@ -48,9 +48,9 @@ } #define FBDrawBitMapInRegionToRgn(_Rgn, reg_ptr, height, width, base_x, base_y) \ - for (Kernel::SizeT i = base_x; i < (width + base_x); ++i) \ + for (Kernel::UInt32 i = base_x; i < (width + base_x); ++i) \ { \ - for (Kernel::SizeT u = base_y; u < (height + base_y); ++u) \ + for (Kernel::UInt32 u = base_y; u < (height + base_y); ++u) \ { \ *(((Kernel::UInt32*)(_Rgn + \ 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \ @@ -63,9 +63,9 @@ /// @brief Cleans a resource. #define FBClearRegion(height, width, base_x, base_y) \ - for (Kernel::SizeT i = base_x; i < (width + base_x); ++i) \ + for (Kernel::UInt32 i = base_x; i < (width + base_x); ++i) \ { \ - for (Kernel::SizeT u = base_y; u < (height + base_y); ++u) \ + for (Kernel::UInt32 u = base_y; u < (height + base_y); ++u) \ { \ *(((volatile Kernel::UInt32*)(kHandoverHeader->f_GOP.f_The + \ 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \ @@ -76,9 +76,9 @@ /// @brief Draws inside a zone. #define FBDrawInRegion(clr, height, width, base_x, base_y) \ - for (Kernel::SizeT x_base = base_x; x_base < (width + base_x); ++x_base) \ + for (Kernel::UInt32 x_base = base_x; x_base < (width + base_x); ++x_base) \ { \ - for (Kernel::SizeT y_base = base_y; y_base < (height + base_y); ++y_base) \ + for (Kernel::UInt32 y_base = base_y; y_base < (height + base_y); ++y_base) \ { \ *(((volatile Kernel::UInt32*)(kHandoverHeader->f_GOP.f_The + \ 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \ @@ -89,9 +89,9 @@ /// @brief Draws inside a zone. #define FBDrawInRegionToRgn(_Rgn, clr, height, width, base_x, base_y) \ - for (Kernel::SizeT x_base = base_x; x_base < (width + base_x); ++x_base) \ + for (Kernel::UInt32 x_base = base_x; x_base < (width + base_x); ++x_base) \ { \ - for (Kernel::SizeT y_base = base_y; y_base < (height + base_y); ++y_base) \ + for (Kernel::UInt32 y_base = base_y; y_base < (height + base_y); ++y_base) \ { \ *(((volatile Kernel::UInt32*)(_Rgn + \ 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \ @@ -102,9 +102,9 @@ } #define FBDrawInRegionA(clr, height, width, base_x, base_y) \ - for (Kernel::SizeT x_base = base_x; x_base < (width + base_x); ++x_base) \ + for (Kernel::UInt32 x_base = base_x; x_base < (width + base_x); ++x_base) \ { \ - for (Kernel::SizeT y_base = base_y; y_base < (height + base_y); ++y_base) \ + for (Kernel::UInt32 y_base = base_y; y_base < (height + base_y); ++y_base) \ { \ *(((volatile Kernel::UInt32*)(kHandoverHeader->f_GOP.f_The + \ 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \ |