Changeset 7eaeec1 in mainline for uspace/lib/softrend/pixconv.h

Timestamp:

2012-08-20T21:27:38Z (13 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

6a97f2e

Parents:

f3a37e28 (diff), dd13349 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• uspace/lib/softrend/pixconv.h (moved) (moved from uspace/lib/fb/imgmap.h ) (7 diffs)

uspace/lib/softrend/pixconv.h

@@ -1 +1 @@
 /*
  * Copyright (c) 2011 Martin Decky
+ * Copyright (c) 2011 Petr Koupy
  * All rights reserved.
  *
@@ -27 +28 @@
  */
 
-/** @addtogroup imgmap
+/** @addtogroup softrend
  * @{
  */
@@ -34 +35 @@
  */
 
-#ifndef IMGMAP_IMGMAP_H_
-#define IMGMAP_IMGMAP_H_
+#ifndef SOFTREND_PIXCONV_H_
+#define SOFTREND_PIXCONV_H_
 
-#include <sys/types.h>
-#include <abi/fb/visuals.h>
 #include <bool.h>
-#include "fb.h"
-
-typedef enum {
-        IMGMAP_FLAG_NONE = 0,
-        IMGMAP_FLAG_SHARED = 1
-} imgmap_flags_t;
+#include <io/pixel.h>
 
 /** Function to render a pixel. */
@@ -56 +50 @@
 typedef pixel_t (*visual2pixel_t)(void *);
 
+extern void pixel2argb_8888(void *, pixel_t);
+extern void pixel2abgr_8888(void *, pixel_t);
+extern void pixel2rgba_8888(void *, pixel_t);
+extern void pixel2bgra_8888(void *, pixel_t);
 extern void pixel2rgb_0888(void *, pixel_t);
 extern void pixel2bgr_0888(void *, pixel_t);
@@ -69 +67 @@
 extern void pixel2gray_8(void *, pixel_t);
 
+extern void visual_mask_8888(void *, bool);
 extern void visual_mask_0888(void *, bool);
 extern void visual_mask_8880(void *, bool);
@@ -77 +76 @@
 extern void visual_mask_8(void *, bool);
 
+extern pixel_t argb_8888_2pixel(void *);
+extern pixel_t abgr_8888_2pixel(void *);
+extern pixel_t rgba_8888_2pixel(void *);
+extern pixel_t bgra_8888_2pixel(void *);
 extern pixel_t rgb_0888_2pixel(void *);
 extern pixel_t bgr_0888_2pixel(void *);
@@ -90 +93 @@
 extern pixel_t gray_8_2pixel(void *);
 
-extern imgmap_t *imgmap_create(sysarg_t, sysarg_t, visual_t, imgmap_flags_t);
-extern void imgmap_put_pixel(imgmap_t *, sysarg_t, sysarg_t, pixel_t);
-extern pixel_t imgmap_get_pixel(imgmap_t *, sysarg_t, sysarg_t);
-
-extern imgmap_t *imgmap_decode_tga(void *, size_t, imgmap_flags_t);
-extern void imgmap_get_resolution(imgmap_t *, sysarg_t *, sysarg_t *);
-
 #endif