Changeset 8e7c9fe in mainline for uspace/lib/draw/source.h

Timestamp:

2014-09-12T03:45:25Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (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

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

• uspace/lib/draw/source.h (modified) (3 diffs)

uspace/lib/draw/source.h

@@ -42 +42 @@
 #include <transform.h>
 #include <filter.h>
+#include <io/pixelmap.h>
 
 #include "surface.h"
@@ -51 +52 @@
         pixel_t color;
         surface_t *texture;
-        bool texture_tile;
+        pixelmap_extend_t texture_extend;
 
         pixel_t alpha;
         surface_t *mask;
-        bool mask_tile;
+        pixelmap_extend_t mask_extend;
 } source_t;
 
@@ -66 +67 @@
 
 extern void source_set_color(source_t *, pixel_t);
-extern void source_set_texture(source_t *, surface_t *, bool);
+extern void source_set_texture(source_t *, surface_t *, pixelmap_extend_t);
 
 extern void source_set_alpha(source_t *, pixel_t);
-extern void source_set_mask(source_t *, surface_t *, bool);
+extern void source_set_mask(source_t *, surface_t *, pixelmap_extend_t);
 
 extern bool source_is_fast(source_t *);