wined3d: Give buffers their own location.

dlls/wined3d/utils.c

@@ -2795,7 +2795,7 @@ void dump_color_fixup_desc(struct color_fixup_desc fixup)
 }
 
 const char *debug_surflocation(DWORD flag) {
-    char buf[152];
+    char buf[172];
 
     buf[0] = 0;
     if (flag & SFLAG_INSYSMEM) strcat(buf, " | SFLAG_INSYSMEM");                    /* 17 */
@@ -2806,6 +2806,7 @@ const char *debug_surflocation(DWORD flag) {
     if (flag & SFLAG_INRB_RESOLVED) strcat(buf, " | SFLAG_INRB_RESOLVED");          /* 22 */
     if (flag & SFLAG_INUSERMEM) strcat(buf, " | SFLAG_INUSERMEM");                  /* 18 */
     if (flag & SFLAG_INDIB) strcat(buf, " | SFLAG_INDIB");                          /* 14 */
+    if (flag & SFLAG_INBUFFER) strcat(buf, " | SFLAG_INBUFFER");                    /* 17 */
     return wine_dbg_sprintf("%s", buf[0] ? buf + 3 : "0");
 }
 

dlls/wined3d/wined3d_private.h

@@ -2299,13 +2299,13 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D
 #define SFLAG_INSYSMEM          0x00002000 /* The system memory copy is current. */
 #define SFLAG_INUSERMEM         0x00004000 /* The user memory copy is current. */
 #define SFLAG_INDIB             0x00008000 /* The DIB copy is current. */
-#define SFLAG_INTEXTURE         0x00010000 /* The GL texture is current. */
-#define SFLAG_INSRGBTEX         0x00020000 /* The GL sRGB texture is current. */
-#define SFLAG_INDRAWABLE        0x00040000 /* The GL drawable is current. */
-#define SFLAG_INRB_MULTISAMPLE  0x00080000 /* The multisample renderbuffer is current. */
-#define SFLAG_INRB_RESOLVED     0x00100000 /* The resolved renderbuffer is current. */
-#define SFLAG_DISCARDED         0x00200000 /* Surface was discarded, allocating new location is enough. */
-#define SFLAG_PBO               0x00400000 /* Use a PBO for mapping. */
+#define SFLAG_INBUFFER          0x00010000 /* The PBO copy is current. */
+#define SFLAG_INTEXTURE         0x00020000 /* The GL texture is current. */
+#define SFLAG_INSRGBTEX         0x00040000 /* The GL sRGB texture is current. */
+#define SFLAG_INDRAWABLE        0x00080000 /* The GL drawable is current. */
+#define SFLAG_INRB_MULTISAMPLE  0x00100000 /* The multisample renderbuffer is current. */
+#define SFLAG_INRB_RESOLVED     0x00200000 /* The resolved renderbuffer is current. */
+#define SFLAG_DISCARDED         0x00400000 /* Surface was discarded, allocating new location is enough. */
 
 /* In some conditions the surface memory must not be freed:
  * SFLAG_CONVERTED: Converting the data back would take too long
@@ -2320,6 +2320,7 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D
 #define SFLAG_LOCATIONS     (SFLAG_INSYSMEM         | \
                              SFLAG_INUSERMEM        | \
                              SFLAG_INDIB            | \
+                             SFLAG_INBUFFER         | \
                              SFLAG_INTEXTURE        | \
                              SFLAG_INSRGBTEX        | \
                              SFLAG_INDRAWABLE       | \