sdl-ios-xcode: src/video/x11/SDL

annotate src/video/x11/SDL_x11render.c @ 5134:7b7da52e8775

Fixed spacing

author	Sam Lantinga <slouken@libsdl.org>
date	Tue, 01 Feb 2011 08:59:22 -0800
parents	619884e8a714
children

rev	line source
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1 /*
4584 9907c8cc6015 X11_RenderFillRects and X11_RenderDrawRects use a server side mask pixmap of 1 bit depth now. All drawing on these pixmaps is done by server side functions such as XDrawRectangles and XFillRectangles. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4583 diff changeset	2
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	3 SDL - Simple DirectMedia Layer
3697 f7b03b6838cb Fixed bug #926 Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	4 Copyright (C) 1997-2010 Sam Lantinga
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	5
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	6 This library is free software; you can redistribute it and/or
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	7 modify it under the terms of the GNU Lesser General Public
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	8 License as published by the Free Software Foundation; either
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	9 version 2.1 of the License, or (at your option) any later version.
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	10
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	11 This library is distributed in the hope that it will be useful,
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	12 but WITHOUT ANY WARRANTY; without even the implied warranty of
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	14 Lesser General Public License for more details.
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	15
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	16 You should have received a copy of the GNU Lesser General Public
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	17 License along with this library; if not, write to the Free Software
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	18 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	19
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	20 Sam Lantinga
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	21 slouken@libsdl.org
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	22 */
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	23 #include "SDL_config.h"
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	24
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	25 #if SDL_VIDEO_RENDER_X11
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	26
3543 c2154674c0c1 Fixed X11 line implementation - clip lines that are going to go outside the window. Sam Lantinga <slouken@libsdl.org> parents: 3538 diff changeset	27 #include <limits.h> /* For INT_MIN and INT_MAX */
c2154674c0c1 Fixed X11 line implementation - clip lines that are going to go outside the window. Sam Lantinga <slouken@libsdl.org> parents: 3538 diff changeset	28
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	29 #include "SDL_x11video.h"
4472 791b3256fb22 Mostly cleaned up warnings with -Wmissing-prototypes Sam Lantinga <slouken@libsdl.org> parents: 4458 diff changeset	30 #include "SDL_x11render.h"
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	31 #include "../SDL_rect_c.h"
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	32 #include "../SDL_pixels_c.h"
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	33 #include "../SDL_yuv_sw_c.h"
4598 66e13a224bd6 Major changes to drawing. Reverted back to core X11 functions due to regressions. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4597 diff changeset	34
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	35 /* X11 renderer implementation */
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	36
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	37 static SDL_Renderer X11_CreateRenderer(SDL_Window window, Uint32 flags);
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	38 static int X11_DisplayModeChanged(SDL_Renderer * renderer);
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	39 static int X11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture);
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	40 static int X11_QueryTexturePixels(SDL_Renderer * renderer,
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	41 SDL_Texture * texture, void **pixels,
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	42 int *pitch);
4616 05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	43 static int X11_SetTextureRGBAMod(SDL_Renderer * renderer,
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	44 SDL_Texture * texture);
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	45 static int X11_SetTextureBlendMode(SDL_Renderer * renderer,
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	46 SDL_Texture * texture);
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	47 static int X11_SetTextureScaleMode(SDL_Renderer * renderer,
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	48 SDL_Texture * texture);
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	49 static int X11_UpdateTexture(SDL_Renderer * renderer, SDL_Texture * texture,
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	50 const SDL_Rect * rect, const void *pixels,
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	51 int pitch);
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	52 static int X11_LockTexture(SDL_Renderer * renderer, SDL_Texture * texture,
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	53 const SDL_Rect * rect, int markDirty,
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	54 void *pixels, int pitch);
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	55 static void X11_UnlockTexture(SDL_Renderer * renderer, SDL_Texture * texture);
2884 9dde605c7540 Date: Fri, 19 Dec 2008 20:17:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2882 diff changeset	56 static int X11_SetDrawBlendMode(SDL_Renderer * renderer);
3596 f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3559 diff changeset	57 static int X11_RenderDrawPoints(SDL_Renderer * renderer,
f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3559 diff changeset	58 const SDL_Point * points, int count);
f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3559 diff changeset	59 static int X11_RenderDrawLines(SDL_Renderer * renderer,
f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3559 diff changeset	60 const SDL_Point * points, int count);
f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3559 diff changeset	61 static int X11_RenderDrawRects(SDL_Renderer * renderer,
f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3559 diff changeset	62 const SDL_Rect ** rects, int count);
f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3559 diff changeset	63 static int X11_RenderFillRects(SDL_Renderer * renderer,
f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3559 diff changeset	64 const SDL_Rect ** rects, int count);
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	65 static int X11_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture,
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	66 const SDL_Rect * srcrect, const SDL_Rect * dstrect);
3559 5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	67 static int X11_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect,
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	68 Uint32 format, void * pixels, int pitch);
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	69 static int X11_RenderWritePixels(SDL_Renderer * renderer, const SDL_Rect * rect,
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	70 Uint32 format, const void * pixels, int pitch);
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	71 static void X11_RenderPresent(SDL_Renderer * renderer);
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	72 static void X11_DestroyTexture(SDL_Renderer * renderer,
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	73 SDL_Texture * texture);
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	74 static void X11_DestroyRenderer(SDL_Renderer * renderer);
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	75
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	76
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	77 SDL_RenderDriver X11_RenderDriver = {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	78 X11_CreateRenderer,
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	79 {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	80 "x11",
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	81 (SDL_RENDERER_SINGLEBUFFER \| SDL_RENDERER_PRESENTCOPY \|
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	82 SDL_RENDERER_PRESENTFLIP2 \| SDL_RENDERER_PRESENTFLIP3 \|
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	83 SDL_RENDERER_PRESENTDISCARD \| SDL_RENDERER_ACCELERATED),
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	84 SDL_TEXTUREMODULATE_NONE,
2884 9dde605c7540 Date: Fri, 19 Dec 2008 20:17:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2882 diff changeset	85 SDL_BLENDMODE_NONE,
4929 aa8888658021 Use the enumerated type for blend and scale mode instead of int Sam Lantinga <slouken@libsdl.org> parents: 4898 diff changeset	86 SDL_SCALEMODE_NONE,
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	87 0,
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	88 {0},
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	89 0,
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	90 0}
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	91 };
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	92
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	93 typedef struct
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	94 {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	95 Display *display;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	96 int screen;
2870 b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2868 diff changeset	97 Visual *visual;
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2868 diff changeset	98 int depth;
2916 ffdd533f7add Fixed pitch alignment problem causing MITSHM error on 16-bit displays Sam Lantinga <slouken@libsdl.org> parents: 2901 diff changeset	99 int scanline_pad;
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3596 diff changeset	100 Window xwindow;
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	101 Pixmap pixmaps[3];
4571 97dcf6f6213c Added a #define option for compile time Xrender support. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4458 diff changeset	102 #ifdef SDL_VIDEO_DRIVER_X11_XRENDER
4597 95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	103 Pixmap stencil;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	104 Pixmap brush;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	105 Picture brush_pict;
4571 97dcf6f6213c Added a #define option for compile time Xrender support. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4458 diff changeset	106 Picture xwindow_pict;
4572 266ec93f49af Correctly handle the availability of Xrender in X11_CreateRenderer and X11_DisplayModeChanged. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4571 diff changeset	107 Picture pixmap_picts[3];
4576 2b98162b536a Add Xrender support to X11_FillRectangles. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4575 diff changeset	108 Picture drawable_pict;
4597 95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	109 Picture stencil_pict;
4588 0ddd78496d68 Preliminary support for blending modes on drawing operations. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4587 diff changeset	110 int blend_op;
4603 dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	111 XRenderPictFormat *xwindow_pict_fmt;
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	112 XRenderPictFormat *drawable_pict_fmt;
4597 95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	113 GC stencil_gc;
4584 9907c8cc6015 X11_RenderFillRects and X11_RenderDrawRects use a server side mask pixmap of 1 bit depth now. All drawing on these pixmaps is done by server side functions such as XDrawRectangles and XFillRectangles. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4583 diff changeset	114 SDL_bool use_xrender;
4603 dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	115 #ifdef SDL_VIDEO_DRIVER_X11_XDAMAGE
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	116 SDL_bool use_xdamage;
4602 4fbf64d504cf Use XDamage to optimise drawing operations. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4600 diff changeset	117 Damage stencil_damage;
4fbf64d504cf Use XDamage to optimise drawing operations. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4600 diff changeset	118 XserverRegion stencil_parts;
4571 97dcf6f6213c Added a #define option for compile time Xrender support. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4458 diff changeset	119 #endif
4603 dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	120 #endif
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	121 int current_pixmap;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	122 Drawable drawable;
2967 e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2927 diff changeset	123 SDL_PixelFormat format;
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	124 GC gc;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	125 SDL_DirtyRectList dirty;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	126 SDL_bool makedirty;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	127 } X11_RenderData;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	128
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	129 typedef struct
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	130 {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	131 SDL_SW_YUVTexture *yuv;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	132 Uint32 format;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	133 Pixmap pixmap;
4593 3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	134 int depth;
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	135 Visual *visual;
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	136 GC gc;
4571 97dcf6f6213c Added a #define option for compile time Xrender support. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4458 diff changeset	137 #ifdef SDL_VIDEO_DRIVER_X11_XRENDER
97dcf6f6213c Added a #define option for compile time Xrender support. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4458 diff changeset	138 Picture picture;
4616 05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	139 Pixmap modulated_pixmap;
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	140 Picture modulated_picture;
4572 266ec93f49af Correctly handle the availability of Xrender in X11_CreateRenderer and X11_DisplayModeChanged. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4571 diff changeset	141 XRenderPictFormat* picture_fmt;
4591 1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	142 int blend_op;
4606 4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	143 const char* filter;
4571 97dcf6f6213c Added a #define option for compile time Xrender support. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4458 diff changeset	144 #endif
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	145 XImage *image;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	146 #ifndef NO_SHARED_MEMORY
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	147 /* MIT shared memory extension information */
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	148 XShmSegmentInfo shminfo;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	149 #endif
2828 7e5ff6cd05bf Added very slow software scaling to the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 2827 diff changeset	150 XImage *scaling_image;
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	151 void *pixels;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	152 int pitch;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	153 } X11_TextureData;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	154
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	155 #ifndef NO_SHARED_MEMORY
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	156 /* Shared memory error handler routine */
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	157 static int shm_error;
2814 e841aa93e6be indent Sam Lantinga <slouken@libsdl.org> parents: 2811 diff changeset	158 static int (X_handler) (Display , XErrorEvent *) = NULL;
e841aa93e6be indent Sam Lantinga <slouken@libsdl.org> parents: 2811 diff changeset	159 static int
e841aa93e6be indent Sam Lantinga <slouken@libsdl.org> parents: 2811 diff changeset	160 shm_errhandler(Display * d, XErrorEvent * e)
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	161 {
2814 e841aa93e6be indent Sam Lantinga <slouken@libsdl.org> parents: 2811 diff changeset	162 if (e->error_code == BadAccess) {
e841aa93e6be indent Sam Lantinga <slouken@libsdl.org> parents: 2811 diff changeset	163 shm_error = True;
e841aa93e6be indent Sam Lantinga <slouken@libsdl.org> parents: 2811 diff changeset	164 return (0);
e841aa93e6be indent Sam Lantinga <slouken@libsdl.org> parents: 2811 diff changeset	165 } else {
e841aa93e6be indent Sam Lantinga <slouken@libsdl.org> parents: 2811 diff changeset	166 return (X_handler(d, e));
e841aa93e6be indent Sam Lantinga <slouken@libsdl.org> parents: 2811 diff changeset	167 }
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	168 }
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	169 #endif /* ! NO_SHARED_MEMORY */
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	170
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	171 static void
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	172 UpdateYUVTextureData(SDL_Texture * texture)
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	173 {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	174 X11_TextureData data = (X11_TextureData ) texture->driverdata;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	175 SDL_Rect rect;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	176
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	177 rect.x = 0;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	178 rect.y = 0;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	179 rect.w = texture->w;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	180 rect.h = texture->h;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	181 SDL_SW_CopyYUVToRGB(data->yuv, &rect, data->format, texture->w,
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	182 texture->h, data->pixels, data->pitch);
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	183 }
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	184
4605 0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	185 #ifdef SDL_VIDEO_DRIVER_X11_XRENDER
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	186 static SDL_bool
4619 b9a205e6369f Moved brace to the beginning of the line for the beginning of functions Sam Lantinga <slouken@libsdl.org> parents: 4618 diff changeset	187 CheckXRender(Display display, int major, int *minor)
b9a205e6369f Moved brace to the beginning of the line for the beginning of functions Sam Lantinga <slouken@libsdl.org> parents: 4618 diff changeset	188 {
4605 0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	189 const char *env;
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	190
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	191 major = minor = 0;
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	192
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	193 env = SDL_getenv("SDL_VIDEO_X11_XRENDER");
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	194
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	195 if (env && !SDL_atoi(env)) {
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	196 return SDL_FALSE;
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	197 }
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	198
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	199 if (!SDL_X11_HAVE_XRENDER) {
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	200 return SDL_FALSE;
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	201 }
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	202
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	203 if (!XRenderQueryVersion(display, major, minor)) {
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	204 return SDL_FALSE;
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	205 }
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	206
4624 b70b99ab75b8 Oops! Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4623 diff changeset	207 if (major != 0 \|\| minor < 10) {
4623 10175d54adf4 Depend on XRender version 0.10 or above and XFixes version 2.0 or above. Moved these dependency checks into CheckXRender() and CheckXFixes(). Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4622 diff changeset	208 return SDL_FALSE;
10175d54adf4 Depend on XRender version 0.10 or above and XFixes version 2.0 or above. Moved these dependency checks into CheckXRender() and CheckXFixes(). Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4622 diff changeset	209 }
10175d54adf4 Depend on XRender version 0.10 or above and XFixes version 2.0 or above. Moved these dependency checks into CheckXRender() and CheckXFixes(). Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4622 diff changeset	210
4605 0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	211 return SDL_TRUE;
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	212 }
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	213 #endif
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	214
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	215 #ifdef SDL_VIDEO_DRIVER_X11_XFIXES
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	216 static SDL_bool
4619 b9a205e6369f Moved brace to the beginning of the line for the beginning of functions Sam Lantinga <slouken@libsdl.org> parents: 4618 diff changeset	217 CheckXFixes(Display display, int major, int *minor)
b9a205e6369f Moved brace to the beginning of the line for the beginning of functions Sam Lantinga <slouken@libsdl.org> parents: 4618 diff changeset	218 {
4605 0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	219 const char *env;
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	220
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	221 major = minor = 0;
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	222
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	223 env = SDL_getenv("SDL_VIDEO_X11_XFIXES");
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	224
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	225 if (env && !SDL_atoi(env)) {
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	226 return SDL_FALSE;
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	227 }
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	228
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	229 if (!SDL_X11_HAVE_XFIXES) {
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	230 return SDL_FALSE;
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	231 }
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	232
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	233 if (!XFixesQueryVersion(display, major, minor)) {
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	234 return SDL_FALSE;
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	235 }
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	236
4624 b70b99ab75b8 Oops! Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4623 diff changeset	237 if (*major < 2) {
4623 10175d54adf4 Depend on XRender version 0.10 or above and XFixes version 2.0 or above. Moved these dependency checks into CheckXRender() and CheckXFixes(). Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4622 diff changeset	238 return SDL_FALSE;
10175d54adf4 Depend on XRender version 0.10 or above and XFixes version 2.0 or above. Moved these dependency checks into CheckXRender() and CheckXFixes(). Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4622 diff changeset	239 }
10175d54adf4 Depend on XRender version 0.10 or above and XFixes version 2.0 or above. Moved these dependency checks into CheckXRender() and CheckXFixes(). Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4622 diff changeset	240
4605 0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	241 return SDL_TRUE;
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	242 }
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	243 #endif
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	244
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	245 #ifdef SDL_VIDEO_DRIVER_X11_XDAMAGE
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	246 static SDL_bool
4619 b9a205e6369f Moved brace to the beginning of the line for the beginning of functions Sam Lantinga <slouken@libsdl.org> parents: 4618 diff changeset	247 CheckXDamage(Display display, int major, int *minor)
b9a205e6369f Moved brace to the beginning of the line for the beginning of functions Sam Lantinga <slouken@libsdl.org> parents: 4618 diff changeset	248 {
4605 0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	249 const char *env;
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	250
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	251 major = minor = 0;
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	252
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	253 env = SDL_getenv("SDL_VIDEO_X11_XDAMAGE");
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	254
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	255 if (env && !SDL_atoi(env)) {
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	256 return SDL_FALSE;
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	257 }
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	258
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	259 if (!SDL_X11_HAVE_XDAMAGE) {
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	260 return SDL_FALSE;
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	261 }
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	262
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	263 if (!XDamageQueryVersion(display, major, minor)) {
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	264 return SDL_FALSE;
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	265 }
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	266
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	267 return SDL_TRUE;
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	268 }
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	269 #endif
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	270
4612 9a5db97cd569 Advertise support for all supported texture formats. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4611 diff changeset	271 #ifdef SDL_VIDEO_DRIVER_X11_XRENDER
9a5db97cd569 Advertise support for all supported texture formats. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4611 diff changeset	272 static Uint32
4619 b9a205e6369f Moved brace to the beginning of the line for the beginning of functions Sam Lantinga <slouken@libsdl.org> parents: 4618 diff changeset	273 XRenderPictFormatToSDLPixelFormatEnum(XRenderPictFormat *pict_format)
b9a205e6369f Moved brace to the beginning of the line for the beginning of functions Sam Lantinga <slouken@libsdl.org> parents: 4618 diff changeset	274 {
4612 9a5db97cd569 Advertise support for all supported texture formats. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4611 diff changeset	275 if (pict_format->type != PictTypeDirect) {
9a5db97cd569 Advertise support for all supported texture formats. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4611 diff changeset	276 SDL_SetError("Indexed pict formats not supported ATM");
9a5db97cd569 Advertise support for all supported texture formats. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4611 diff changeset	277 return 0;
9a5db97cd569 Advertise support for all supported texture formats. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4611 diff changeset	278 }
9a5db97cd569 Advertise support for all supported texture formats. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4611 diff changeset	279 Uint32 Amask, Rmask, Gmask, Bmask;
9a5db97cd569 Advertise support for all supported texture formats. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4611 diff changeset	280 int bpp;
9a5db97cd569 Advertise support for all supported texture formats. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4611 diff changeset	281
9a5db97cd569 Advertise support for all supported texture formats. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4611 diff changeset	282 Rmask = pict_format->direct.redMask << pict_format->direct.red;
9a5db97cd569 Advertise support for all supported texture formats. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4611 diff changeset	283 Gmask = pict_format->direct.greenMask << pict_format->direct.green;
9a5db97cd569 Advertise support for all supported texture formats. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4611 diff changeset	284 Bmask = pict_format->direct.blueMask << pict_format->direct.blue;
9a5db97cd569 Advertise support for all supported texture formats. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4611 diff changeset	285 Amask = pict_format->direct.alphaMask << pict_format->direct.alpha;
9a5db97cd569 Advertise support for all supported texture formats. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4611 diff changeset	286 bpp = pict_format->depth;
9a5db97cd569 Advertise support for all supported texture formats. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4611 diff changeset	287
9a5db97cd569 Advertise support for all supported texture formats. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4611 diff changeset	288 Uint32 format;
9a5db97cd569 Advertise support for all supported texture formats. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4611 diff changeset	289 format = SDL_MasksToPixelFormatEnum(bpp, Rmask, Gmask, Bmask, Amask);
9a5db97cd569 Advertise support for all supported texture formats. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4611 diff changeset	290 return format;
9a5db97cd569 Advertise support for all supported texture formats. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4611 diff changeset	291 }
9a5db97cd569 Advertise support for all supported texture formats. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4611 diff changeset	292 #endif
9a5db97cd569 Advertise support for all supported texture formats. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4611 diff changeset	293
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	294 void
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	295 X11_AddRenderDriver(_THIS)
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	296 {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	297 SDL_RendererInfo *info = &X11_RenderDriver.info;
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3596 diff changeset	298 SDL_DisplayMode *mode = &SDL_CurrentDisplay->desktop_mode;
4605 0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	299 SDL_VideoData data = (SDL_VideoData ) _this->driverdata;
3520 83518f8fcd61 Fixed calls to SDL_AddRenderDriver() Sam Lantinga <slouken@libsdl.org> parents: 3239 diff changeset	300 int i;
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	301
2870 b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2868 diff changeset	302 info->texture_formats[info->num_texture_formats++] = mode->format;
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2868 diff changeset	303 info->texture_formats[info->num_texture_formats++] = SDL_PIXELFORMAT_YV12;
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2868 diff changeset	304 info->texture_formats[info->num_texture_formats++] = SDL_PIXELFORMAT_IYUV;
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2868 diff changeset	305 info->texture_formats[info->num_texture_formats++] = SDL_PIXELFORMAT_YUY2;
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2868 diff changeset	306 info->texture_formats[info->num_texture_formats++] = SDL_PIXELFORMAT_UYVY;
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2868 diff changeset	307 info->texture_formats[info->num_texture_formats++] = SDL_PIXELFORMAT_YVYU;
4605 0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	308
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	309 #ifdef SDL_VIDEO_DRIVER_X11_XRENDER
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	310 int major, minor;
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	311 if (CheckXRender(data->display, &major, &minor)) {
4612 9a5db97cd569 Advertise support for all supported texture formats. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4611 diff changeset	312 XRenderPictFormat templ;
9a5db97cd569 Advertise support for all supported texture formats. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4611 diff changeset	313 templ.type = PictTypeDirect;
9a5db97cd569 Advertise support for all supported texture formats. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4611 diff changeset	314 XRenderPictFormat *pict_format;
9a5db97cd569 Advertise support for all supported texture formats. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4611 diff changeset	315 Uint32 format;
9a5db97cd569 Advertise support for all supported texture formats. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4611 diff changeset	316 int i = 0;
4633 100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	317 /* Convert each XRenderPictFormat into appropriate
100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	318 * SDLPixelFormatEnum. */
4612 9a5db97cd569 Advertise support for all supported texture formats. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4611 diff changeset	319 while (info->num_texture_formats < 50) {
9a5db97cd569 Advertise support for all supported texture formats. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4611 diff changeset	320 pict_format =
9a5db97cd569 Advertise support for all supported texture formats. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4611 diff changeset	321 XRenderFindFormat(data->display, PictFormatType, &templ, i++);
9a5db97cd569 Advertise support for all supported texture formats. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4611 diff changeset	322 if (pict_format) {
9a5db97cd569 Advertise support for all supported texture formats. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4611 diff changeset	323 format = XRenderPictFormatToSDLPixelFormatEnum(pict_format);
9a5db97cd569 Advertise support for all supported texture formats. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4611 diff changeset	324 if (format != SDL_PIXELTYPE_UNKNOWN) {
9a5db97cd569 Advertise support for all supported texture formats. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4611 diff changeset	325 info->texture_formats[info->num_texture_formats++] = format;
9a5db97cd569 Advertise support for all supported texture formats. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4611 diff changeset	326 }
9a5db97cd569 Advertise support for all supported texture formats. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4611 diff changeset	327 }
9a5db97cd569 Advertise support for all supported texture formats. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4611 diff changeset	328 else
9a5db97cd569 Advertise support for all supported texture formats. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4611 diff changeset	329 break;
9a5db97cd569 Advertise support for all supported texture formats. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4611 diff changeset	330 }
4633 100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	331 /* Update the capabilities of the renderer. */
4616 05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	332 info->blend_modes \|= (SDL_BLENDMODE_BLEND \| SDL_BLENDMODE_ADD \|
4611 a2ed55b5ff85 Advertise support for blending modes and scaling modes in the render driver. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4610 diff changeset	333 SDL_BLENDMODE_MOD \| SDL_BLENDMODE_MASK);
4929 aa8888658021 Use the enumerated type for blend and scale mode instead of int Sam Lantinga <slouken@libsdl.org> parents: 4898 diff changeset	334 info->scale_modes \|= (SDL_SCALEMODE_FAST \| SDL_SCALEMODE_SLOW \|
aa8888658021 Use the enumerated type for blend and scale mode instead of int Sam Lantinga <slouken@libsdl.org> parents: 4898 diff changeset	335 SDL_SCALEMODE_BEST);
4616 05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	336 info->mod_modes \|= (SDL_TEXTUREMODULATE_COLOR \| SDL_TEXTUREMODULATE_ALPHA);
4605 0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	337 }
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	338 #endif
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	339
3520 83518f8fcd61 Fixed calls to SDL_AddRenderDriver() Sam Lantinga <slouken@libsdl.org> parents: 3239 diff changeset	340 for (i = 0; i < _this->num_displays; ++i) {
83518f8fcd61 Fixed calls to SDL_AddRenderDriver() Sam Lantinga <slouken@libsdl.org> parents: 3239 diff changeset	341 SDL_AddRenderDriver(&_this->displays[i], &X11_RenderDriver);
83518f8fcd61 Fixed calls to SDL_AddRenderDriver() Sam Lantinga <slouken@libsdl.org> parents: 3239 diff changeset	342 }
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	343 }
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	344
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	345 SDL_Renderer *
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	346 X11_CreateRenderer(SDL_Window * window, Uint32 flags)
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	347 {
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3596 diff changeset	348 SDL_VideoDisplay *display = window->display;
2870 b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2868 diff changeset	349 SDL_DisplayData displaydata = (SDL_DisplayData ) display->driverdata;
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	350 SDL_WindowData windowdata = (SDL_WindowData ) window->driverdata;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	351 SDL_Renderer *renderer;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	352 X11_RenderData *data;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	353 XGCValues gcv;
4596 dc26c37ad70e Got testsprite2 to work reasonably. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4595 diff changeset	354 gcv.graphics_exposures = False;
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	355 int i, n;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	356 int bpp;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	357 Uint32 Rmask, Gmask, Bmask, Amask;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	358
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	359 renderer = (SDL_Renderer ) SDL_calloc(1, sizeof(renderer));
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	360 if (!renderer) {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	361 SDL_OutOfMemory();
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	362 return NULL;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	363 }
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	364
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	365 data = (X11_RenderData ) SDL_calloc(1, sizeof(data));
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	366 if (!data) {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	367 X11_DestroyRenderer(renderer);
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	368 SDL_OutOfMemory();
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	369 return NULL;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	370 }
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	371 data->display = windowdata->videodata->display;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	372 data->screen = displaydata->screen;
2870 b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2868 diff changeset	373 data->visual = displaydata->visual;
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2868 diff changeset	374 data->depth = displaydata->depth;
2916 ffdd533f7add Fixed pitch alignment problem causing MITSHM error on 16-bit displays Sam Lantinga <slouken@libsdl.org> parents: 2901 diff changeset	375 data->scanline_pad = displaydata->scanline_pad;
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3596 diff changeset	376 data->xwindow = windowdata->xwindow;
4590 1ad70fb49fcb Fix so many things that there is little place in this column to list them all but the result is that blending modes just work now for drawing primitives. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4589 diff changeset	377
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	378 renderer->DisplayModeChanged = X11_DisplayModeChanged;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	379 renderer->CreateTexture = X11_CreateTexture;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	380 renderer->QueryTexturePixels = X11_QueryTexturePixels;
4616 05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	381 renderer->SetTextureAlphaMod = X11_SetTextureRGBAMod;
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	382 renderer->SetTextureColorMod = X11_SetTextureRGBAMod;
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	383 renderer->SetTextureBlendMode = X11_SetTextureBlendMode;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	384 renderer->SetTextureScaleMode = X11_SetTextureScaleMode;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	385 renderer->UpdateTexture = X11_UpdateTexture;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	386 renderer->LockTexture = X11_LockTexture;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	387 renderer->UnlockTexture = X11_UnlockTexture;
2884 9dde605c7540 Date: Fri, 19 Dec 2008 20:17:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2882 diff changeset	388 renderer->SetDrawBlendMode = X11_SetDrawBlendMode;
3596 f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3559 diff changeset	389 renderer->RenderDrawPoints = X11_RenderDrawPoints;
f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3559 diff changeset	390 renderer->RenderDrawLines = X11_RenderDrawLines;
f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3559 diff changeset	391 renderer->RenderDrawRects = X11_RenderDrawRects;
f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3559 diff changeset	392 renderer->RenderFillRects = X11_RenderFillRects;
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	393 renderer->RenderCopy = X11_RenderCopy;
3559 5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	394 renderer->RenderReadPixels = X11_RenderReadPixels;
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	395 renderer->RenderWritePixels = X11_RenderWritePixels;
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	396 renderer->RenderPresent = X11_RenderPresent;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	397 renderer->DestroyTexture = X11_DestroyTexture;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	398 renderer->DestroyRenderer = X11_DestroyRenderer;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	399 renderer->info = X11_RenderDriver.info;
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3596 diff changeset	400 renderer->window = window;
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	401 renderer->driverdata = data;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	402
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	403 renderer->info.flags = SDL_RENDERER_ACCELERATED;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	404
4590 1ad70fb49fcb Fix so many things that there is little place in this column to list them all but the result is that blending modes just work now for drawing primitives. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4589 diff changeset	405 #ifdef SDL_VIDEO_DRIVER_X11_XRENDER
4605 0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	406 int major, minor;
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	407 data->use_xrender = CheckXRender(data->display, &major, &minor);
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	408 #ifdef SDL_VIDEO_DRIVER_X11_XDAMAGE
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	409 if (CheckXDamage(data->display, &major, &minor)) {
0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	410 if (CheckXFixes(data->display, &major, &minor)) {
4623 10175d54adf4 Depend on XRender version 0.10 or above and XFixes version 2.0 or above. Moved these dependency checks into CheckXRender() and CheckXFixes(). Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4622 diff changeset	411 data->use_xdamage = SDL_TRUE;
4605 0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	412 }
4593 3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	413 }
4605 0b3a509c53a0 Respect environment variables. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4604 diff changeset	414 #endif
4593 3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	415 if (data->use_xrender) {
4603 dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	416 /* Find the PictFormat from the visual.
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	417 * Should be an RGB PictFormat most of the time. */
4591 1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	418 data->xwindow_pict_fmt = XRenderFindVisualFormat(data->display,
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	419 data->visual);
4593 3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	420 if (!data->xwindow_pict_fmt) {
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	421 SDL_SetError("XRenderFindVisualFormat() failed");
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	422 return NULL;
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	423 }
4591 1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	424 data->xwindow_pict = XRenderCreatePicture(data->display,
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	425 data->xwindow,
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	426 data->xwindow_pict_fmt,
4590 1ad70fb49fcb Fix so many things that there is little place in this column to list them all but the result is that blending modes just work now for drawing primitives. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4589 diff changeset	427 0, NULL);
4593 3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	428 if (!data->xwindow_pict) {
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	429 SDL_SetError("XRenderCreatePicture() failed");
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	430 return NULL;
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	431 }
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	432 // FIXME: Clear the window. Is this required?
4591 1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	433 XRenderComposite(data->display,
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	434 PictOpClear,
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	435 data->xwindow_pict,
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	436 None,
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	437 data->xwindow_pict,
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	438 0, 0,
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	439 0, 0,
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	440 0, 0,
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	441 window->w, window->h);
4603 dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	442 /* Create a clip mask that is used for rendering primitives. */
4597 95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	443 data->stencil = XCreatePixmap(data->display, data->xwindow,
4607 9e9ec5e3be95 Get SDL_BLENDMODE_MOD to work! Tested on nvidia only ATM. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4606 diff changeset	444 window->w, window->h, 32);
4633 100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	445 if (!data->stencil) {
100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	446 SDL_SetError("XCreatePixmap() failed.");
100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	447 return NULL;
100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	448 }
4597 95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	449
4603 dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	450 /* Create the GC for the clip mask. */
4597 95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	451 data->stencil_gc = XCreateGC(data->display, data->stencil,
4596 dc26c37ad70e Got testsprite2 to work reasonably. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4595 diff changeset	452 GCGraphicsExposures, &gcv);
4633 100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	453 /* Set the GC parameters. */
4607 9e9ec5e3be95 Get SDL_BLENDMODE_MOD to work! Tested on nvidia only ATM. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4606 diff changeset	454 XSetBackground(data->display, data->stencil_gc, 0);
9e9ec5e3be95 Get SDL_BLENDMODE_MOD to work! Tested on nvidia only ATM. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4606 diff changeset	455 XSetForeground(data->display, data->stencil_gc, 0);
4602 4fbf64d504cf Use XDamage to optimise drawing operations. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4600 diff changeset	456 XFillRectangle(data->display, data->stencil, data->stencil_gc,
4fbf64d504cf Use XDamage to optimise drawing operations. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4600 diff changeset	457 0, 0, window->w, window->h);
4607 9e9ec5e3be95 Get SDL_BLENDMODE_MOD to work! Tested on nvidia only ATM. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4606 diff changeset	458 XSetForeground(data->display, data->stencil_gc, 0xFFFFFFFF);
4633 100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	459
100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	460 /* Create an XRender Picture for the clip mask. */
4597 95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	461 data->stencil_pict =
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	462 XRenderCreatePicture(data->display, data->stencil,
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	463 XRenderFindStandardFormat(data->display,
4607 9e9ec5e3be95 Get SDL_BLENDMODE_MOD to work! Tested on nvidia only ATM. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4606 diff changeset	464 PictStandardARGB32),
4597 95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	465 0, NULL);
4633 100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	466 if (!data->stencil_pict) {
100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	467 SDL_SetError("XRenderCreatePicture() failed.");
100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	468 return NULL;
100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	469 }
4603 dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	470 #ifdef SDL_VIDEO_DRIVER_X11_XDAMAGE
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	471 if (data->use_xdamage) {
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	472 data->stencil_damage =
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	473 XDamageCreate(data->display, data->stencil, XDamageReportNonEmpty);
4633 100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	474 if (!data->stencil_damage) {
100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	475 SDL_SetError("XDamageCreate() failed.");
100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	476 return NULL;
100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	477 }
4603 dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	478 XDamageSubtract(data->display, data->stencil_damage, None, data->stencil_parts);
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	479 }
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	480 #endif
4633 100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	481 /* Create a brush pixmap for the color being
100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	482 * drawn at any given time. */
4597 95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	483 data->brush =
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	484 XCreatePixmap(data->display, data->xwindow, 1, 1, 32);
4633 100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	485 if (!data->brush) {
100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	486 SDL_SetError("XCreatePixmap() failed.");
100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	487 return NULL;
100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	488 }
100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	489
100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	490 /* Set some parameters for the brush. */
4597 95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	491 XRenderPictureAttributes brush_attr;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	492 brush_attr.repeat = RepeatNormal;
4633 100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	493 /* Create an XRender Picture for the brush
100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	494 * with the above parameters. */
4597 95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	495 data->brush_pict =
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	496 XRenderCreatePicture(data->display, data->brush,
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	497 XRenderFindStandardFormat(data->display,
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	498 PictStandardARGB32),
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	499 CPRepeat, &brush_attr);
4633 100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	500 if (!data->brush_pict) {
100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	501 SDL_SetError("XRenderCreatePicture() failed.");
100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	502 return NULL;
100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	503 }
100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	504 // FIXME: Is the following necessary?
100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	505 /* Set the default blending mode. */
4590 1ad70fb49fcb Fix so many things that there is little place in this column to list them all but the result is that blending modes just work now for drawing primitives. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4589 diff changeset	506 renderer->blendMode = SDL_BLENDMODE_BLEND;
1ad70fb49fcb Fix so many things that there is little place in this column to list them all but the result is that blending modes just work now for drawing primitives. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4589 diff changeset	507 data->blend_op = PictOpOver;
1ad70fb49fcb Fix so many things that there is little place in this column to list them all but the result is that blending modes just work now for drawing primitives. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4589 diff changeset	508 }
1ad70fb49fcb Fix so many things that there is little place in this column to list them all but the result is that blending modes just work now for drawing primitives. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4589 diff changeset	509 #endif
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	510 if (flags & SDL_RENDERER_SINGLEBUFFER) {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	511 renderer->info.flags \|=
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	512 (SDL_RENDERER_SINGLEBUFFER \| SDL_RENDERER_PRESENTCOPY);
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	513 n = 0;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	514 } else if (flags & SDL_RENDERER_PRESENTFLIP2) {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	515 renderer->info.flags \|= SDL_RENDERER_PRESENTFLIP2;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	516 n = 2;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	517 } else if (flags & SDL_RENDERER_PRESENTFLIP3) {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	518 renderer->info.flags \|= SDL_RENDERER_PRESENTFLIP3;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	519 n = 3;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	520 } else {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	521 renderer->info.flags \|= SDL_RENDERER_PRESENTCOPY;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	522 n = 1;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	523 }
4603 dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	524 #ifdef SDL_VIDEO_DRIVER_X11_XRENDER
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	525 if (data->use_xrender) {
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	526 if (n > 0)
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	527 data->drawable_pict_fmt =
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	528 XRenderFindStandardFormat(data->display, PictStandardARGB32);
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	529 else
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	530 data->drawable_pict_fmt = data->xwindow_pict_fmt;
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	531 }
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	532 #endif
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	533 for (i = 0; i < n; ++i) {
4591 1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	534 #ifdef SDL_VIDEO_DRIVER_X11_XRENDER
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	535 if (data->use_xrender) {
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	536 data->pixmaps[i] = XCreatePixmap(data->display,
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	537 data->xwindow,
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	538 window->w,
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	539 window->h,
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	540 32);
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	541 }
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	542 else
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	543 #endif
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	544 {
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	545 data->pixmaps[i] =
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	546 XCreatePixmap(data->display, data->xwindow, window->w, window->h,
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	547 displaydata->depth);
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	548 }
4633 100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	549 if (!data->pixmaps[i]) {
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	550 X11_DestroyRenderer(renderer);
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	551 SDL_SetError("XCreatePixmap() failed");
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	552 return NULL;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	553 }
4573 6399178be313 Completed work on X11_CreateTexture. Added lots of safety features. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4572 diff changeset	554 #ifdef SDL_VIDEO_DRIVER_X11_XRENDER
4593 3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	555 if (data->use_xrender) {
4633 100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	556 /* Create XRender pictures for each of the pixmaps
4603 dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	557 * and clear the pixmaps. */
4573 6399178be313 Completed work on X11_CreateTexture. Added lots of safety features. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4572 diff changeset	558 data->pixmap_picts[i] =
4591 1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	559 XRenderCreatePicture(data->display,
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	560 data->pixmaps[i],
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	561 XRenderFindStandardFormat(data->display,
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	562 PictStandardARGB32),
4583 5c925d4f220f X11_DrawRects now uses a very hacky way of drawing rectangles with XRender. This will be improved in some time. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4582 diff changeset	563 0, None);
4593 3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	564 if (!data->pixmap_picts[i]) {
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	565 SDL_SetError("XRenderCreatePicture() failed");
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	566 return NULL;
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	567 }
4591 1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	568
4593 3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	569 XRenderComposite(data->display,
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	570 PictOpClear,
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	571 data->pixmap_picts[i],
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	572 None,
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	573 data->pixmap_picts[i],
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	574 0, 0,
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	575 0, 0,
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	576 0, 0,
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	577 window->w, window->h);
4573 6399178be313 Completed work on X11_CreateTexture. Added lots of safety features. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4572 diff changeset	578 }
6399178be313 Completed work on X11_CreateTexture. Added lots of safety features. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4572 diff changeset	579 #endif
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	580 }
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	581 if (n > 0) {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	582 data->drawable = data->pixmaps[0];
4572 266ec93f49af Correctly handle the availability of Xrender in X11_CreateRenderer and X11_DisplayModeChanged. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4571 diff changeset	583 #ifdef SDL_VIDEO_DRIVER_X11_XRENDER
4584 9907c8cc6015 X11_RenderFillRects and X11_RenderDrawRects use a server side mask pixmap of 1 bit depth now. All drawing on these pixmaps is done by server side functions such as XDrawRectangles and XFillRectangles. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4583 diff changeset	584 if(data->use_xrender == SDL_TRUE)
4576 2b98162b536a Add Xrender support to X11_FillRectangles. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4575 diff changeset	585 data->drawable_pict = data->pixmap_picts[0];
4572 266ec93f49af Correctly handle the availability of Xrender in X11_CreateRenderer and X11_DisplayModeChanged. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4571 diff changeset	586 #endif
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	587 data->makedirty = SDL_TRUE;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	588 } else {
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3596 diff changeset	589 data->drawable = data->xwindow;
4572 266ec93f49af Correctly handle the availability of Xrender in X11_CreateRenderer and X11_DisplayModeChanged. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4571 diff changeset	590 #ifdef SDL_VIDEO_DRIVER_X11_XRENDER
4584 9907c8cc6015 X11_RenderFillRects and X11_RenderDrawRects use a server side mask pixmap of 1 bit depth now. All drawing on these pixmaps is done by server side functions such as XDrawRectangles and XFillRectangles. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4583 diff changeset	591 if(data->use_xrender == SDL_TRUE)
4576 2b98162b536a Add Xrender support to X11_FillRectangles. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4575 diff changeset	592 data->drawable_pict = data->xwindow_pict;
4572 266ec93f49af Correctly handle the availability of Xrender in X11_CreateRenderer and X11_DisplayModeChanged. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4571 diff changeset	593 #endif
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	594 data->makedirty = SDL_FALSE;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	595 }
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	596 data->current_pixmap = 0;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	597
4603 dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	598 #ifdef SDL_VIDEO_DRIVER_X11_XRENDER
4633 100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	599 /* When using XRender the drawable format
100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	600 * is not the same as the screen format. */
4603 dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	601 if (data->use_xrender) {
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	602 bpp = data->drawable_pict_fmt->depth;
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	603 Rmask = ((data->drawable_pict_fmt->direct.redMask)
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	604 << (data->drawable_pict_fmt->direct.red));
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	605 Gmask = ((data->drawable_pict_fmt->direct.greenMask)
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	606 << (data->drawable_pict_fmt->direct.green));
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	607 Bmask = ((data->drawable_pict_fmt->direct.blueMask)
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	608 << (data->drawable_pict_fmt->direct.blue));
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	609 Amask = ((data->drawable_pict_fmt->direct.alphaMask)
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	610 << (data->drawable_pict_fmt->direct.alpha));
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	611 }
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	612 else
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	613 #endif
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	614 {
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	615 /* Get the format of the window */
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	616 if (!SDL_PixelFormatEnumToMasks
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	617 (display->current_mode.format, &bpp, &Rmask, &Gmask, &Bmask,
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	618 &Amask)) {
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	619 SDL_SetError("Unknown display format");
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	620 X11_DestroyRenderer(renderer);
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	621 return NULL;
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	622 }
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	623 }
2967 e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2927 diff changeset	624 SDL_InitFormat(&data->format, bpp, Rmask, Gmask, Bmask, Amask);
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	625
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	626 /* Create the drawing context */
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	627 gcv.graphics_exposures = False;
2814 e841aa93e6be indent Sam Lantinga <slouken@libsdl.org> parents: 2811 diff changeset	628 data->gc =
4598 66e13a224bd6 Major changes to drawing. Reverted back to core X11 functions due to regressions. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4597 diff changeset	629 XCreateGC(data->display, data->drawable, GCGraphicsExposures, &gcv);
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	630 if (!data->gc) {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	631 X11_DestroyRenderer(renderer);
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	632 SDL_SetError("XCreateGC() failed");
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	633 return NULL;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	634 }
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	635
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	636 return renderer;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	637 }
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	638
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	639 static int
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	640 X11_DisplayModeChanged(SDL_Renderer * renderer)
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	641 {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	642 X11_RenderData data = (X11_RenderData ) renderer->driverdata;
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3596 diff changeset	643 SDL_Window *window = renderer->window;
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	644 int i, n;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	645
4596 dc26c37ad70e Got testsprite2 to work reasonably. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4595 diff changeset	646 #ifdef SDL_VIDEO_DRIVER_X11_XRENDER
dc26c37ad70e Got testsprite2 to work reasonably. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4595 diff changeset	647 if (data->use_xrender) {
dc26c37ad70e Got testsprite2 to work reasonably. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4595 diff changeset	648 XRenderFreePicture(data->display, data->xwindow_pict);
4608 ff7b00d4b0d3 Fix X11_DisplayModeChanged. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4607 diff changeset	649
4596 dc26c37ad70e Got testsprite2 to work reasonably. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4595 diff changeset	650 data->xwindow_pict_fmt =
dc26c37ad70e Got testsprite2 to work reasonably. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4595 diff changeset	651 XRenderFindVisualFormat(data->display, data->visual);
4633 100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	652 if (!data->xwindow_pict_fmt) {
100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	653 SDL_SetError("XRenderFindVisualFormat() failed.");
100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	654 return -1;
100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	655 }
100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	656
4596 dc26c37ad70e Got testsprite2 to work reasonably. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4595 diff changeset	657 data->xwindow_pict =
dc26c37ad70e Got testsprite2 to work reasonably. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4595 diff changeset	658 XRenderCreatePicture(data->display, data->xwindow,
dc26c37ad70e Got testsprite2 to work reasonably. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4595 diff changeset	659 data->xwindow_pict_fmt, 0, NULL);
4633 100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	660 if (!data->xwindow_pict) {
100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	661 SDL_SetError("XRenderCreatePicture() failed.");
100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	662 return -1;
100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	663 }
100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	664
4608 ff7b00d4b0d3 Fix X11_DisplayModeChanged. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4607 diff changeset	665 XRenderComposite(data->display,
ff7b00d4b0d3 Fix X11_DisplayModeChanged. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4607 diff changeset	666 PictOpClear,
ff7b00d4b0d3 Fix X11_DisplayModeChanged. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4607 diff changeset	667 data->xwindow_pict,
ff7b00d4b0d3 Fix X11_DisplayModeChanged. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4607 diff changeset	668 None,
ff7b00d4b0d3 Fix X11_DisplayModeChanged. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4607 diff changeset	669 data->xwindow_pict,
ff7b00d4b0d3 Fix X11_DisplayModeChanged. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4607 diff changeset	670 0, 0,
ff7b00d4b0d3 Fix X11_DisplayModeChanged. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4607 diff changeset	671 0, 0,
ff7b00d4b0d3 Fix X11_DisplayModeChanged. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4607 diff changeset	672 0, 0,
ff7b00d4b0d3 Fix X11_DisplayModeChanged. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4607 diff changeset	673 window->w, window->h);
ff7b00d4b0d3 Fix X11_DisplayModeChanged. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4607 diff changeset	674
ff7b00d4b0d3 Fix X11_DisplayModeChanged. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4607 diff changeset	675 XFreePixmap(data->display, data->stencil);
ff7b00d4b0d3 Fix X11_DisplayModeChanged. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4607 diff changeset	676 data->stencil = XCreatePixmap(data->display, data->xwindow,
ff7b00d4b0d3 Fix X11_DisplayModeChanged. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4607 diff changeset	677 window->w, window->h, 32);
4633 100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	678 if (!data->stencil) {
100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	679 SDL_SetError("XCreatePixmap() failed.");
100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	680 return -1;
100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	681 }
100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	682
4608 ff7b00d4b0d3 Fix X11_DisplayModeChanged. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4607 diff changeset	683 XRenderFreePicture(data->display, data->stencil_pict);
ff7b00d4b0d3 Fix X11_DisplayModeChanged. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4607 diff changeset	684 data->stencil_pict =
ff7b00d4b0d3 Fix X11_DisplayModeChanged. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4607 diff changeset	685 XRenderCreatePicture(data->display, data->stencil,
ff7b00d4b0d3 Fix X11_DisplayModeChanged. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4607 diff changeset	686 XRenderFindStandardFormat(data->display,
ff7b00d4b0d3 Fix X11_DisplayModeChanged. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4607 diff changeset	687 PictStandardARGB32),
ff7b00d4b0d3 Fix X11_DisplayModeChanged. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4607 diff changeset	688 0, NULL);
4633 100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	689 if (!data->stencil_pict) {
100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	690 SDL_SetError("XRenderCreatePicture() failed.");
100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	691 return -1;
100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	692 }
4608 ff7b00d4b0d3 Fix X11_DisplayModeChanged. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4607 diff changeset	693 #ifdef SDL_VIDEO_DRIVER_X11_XDAMAGE
ff7b00d4b0d3 Fix X11_DisplayModeChanged. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4607 diff changeset	694 if (data->use_xdamage) {
4898 164bee619400 XDamageDestroy is called before use_damage is tested. This crashes on my Sam Lantinga <slouken@libsdl.org> parents: 4633 diff changeset	695 XDamageDestroy(data->display, data->stencil_damage);
4608 ff7b00d4b0d3 Fix X11_DisplayModeChanged. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4607 diff changeset	696 data->stencil_damage =
ff7b00d4b0d3 Fix X11_DisplayModeChanged. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4607 diff changeset	697 XDamageCreate(data->display, data->stencil, XDamageReportNonEmpty);
4633 100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	698 if (!data->stencil_damage) {
100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	699 SDL_SetError("XDamageCreate() failed.");
100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	700 return -1;
100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	701 }
4608 ff7b00d4b0d3 Fix X11_DisplayModeChanged. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4607 diff changeset	702 XDamageSubtract(data->display, data->stencil_damage, None, data->stencil_parts);
ff7b00d4b0d3 Fix X11_DisplayModeChanged. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4607 diff changeset	703 }
ff7b00d4b0d3 Fix X11_DisplayModeChanged. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4607 diff changeset	704 #endif
4596 dc26c37ad70e Got testsprite2 to work reasonably. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4595 diff changeset	705 }
dc26c37ad70e Got testsprite2 to work reasonably. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4595 diff changeset	706 #endif
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	707 if (renderer->info.flags & SDL_RENDERER_SINGLEBUFFER) {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	708 n = 0;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	709 } else if (renderer->info.flags & SDL_RENDERER_PRESENTFLIP2) {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	710 n = 2;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	711 } else if (renderer->info.flags & SDL_RENDERER_PRESENTFLIP3) {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	712 n = 3;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	713 } else {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	714 n = 1;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	715 }
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	716 for (i = 0; i < n; ++i) {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	717 if (data->pixmaps[i] != None) {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	718 XFreePixmap(data->display, data->pixmaps[i]);
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	719 data->pixmaps[i] = None;
4572 266ec93f49af Correctly handle the availability of Xrender in X11_CreateRenderer and X11_DisplayModeChanged. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4571 diff changeset	720 #ifdef SDL_VIDEO_DRIVER_X11_XRENDER
4596 dc26c37ad70e Got testsprite2 to work reasonably. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4595 diff changeset	721 XRenderFreePicture(data->display, data->pixmap_picts[i]);
4577 87a2d87786d4 Modified configure.in to allow building with Xrender. Fixed all problems that prevented compilation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4576 diff changeset	722 data->pixmap_picts[i] = None;
4572 266ec93f49af Correctly handle the availability of Xrender in X11_CreateRenderer and X11_DisplayModeChanged. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4571 diff changeset	723 #endif
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	724 }
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	725 }
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	726 for (i = 0; i < n; ++i) {
4591 1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	727 #ifdef SDL_VIDEO_DRIVER_X11_XRENDER
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	728 if (data->use_xrender) {
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	729 data->pixmaps[i] =
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	730 XCreatePixmap(data->display,
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	731 data->xwindow,
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	732 window->w,
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	733 window->h,
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	734 32);
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	735 }
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	736 else
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	737 #endif
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	738 {
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	739 data->pixmaps[i] =
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	740 XCreatePixmap(data->display, data->xwindow, window->w, window->h,
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	741 data->depth);
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	742 }
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	743 if (data->pixmaps[i] == None) {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	744 SDL_SetError("XCreatePixmap() failed");
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	745 return -1;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	746 }
4572 266ec93f49af Correctly handle the availability of Xrender in X11_CreateRenderer and X11_DisplayModeChanged. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4571 diff changeset	747 #ifdef SDL_VIDEO_DRIVER_X11_XRENDER
4593 3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	748 if (data->use_xrender) {
4577 87a2d87786d4 Modified configure.in to allow building with Xrender. Fixed all problems that prevented compilation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4576 diff changeset	749 data->pixmap_picts[i] =
4591 1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	750 XRenderCreatePicture(data->display,
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	751 data->pixmaps[i],
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	752 XRenderFindStandardFormat(data->display,
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	753 PictStandardARGB32),
4583 5c925d4f220f X11_DrawRects now uses a very hacky way of drawing rectangles with XRender. This will be improved in some time. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4582 diff changeset	754 0, None);
4593 3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	755 if (!data->pixmap_picts[i]) {
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	756 SDL_SetError("XRenderCreatePicture() failed");
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	757 return -1;
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	758 }
4591 1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	759 XRenderComposite(data->display,
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	760 PictOpClear,
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	761 data->pixmap_picts[i],
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	762 None,
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	763 data->pixmap_picts[i],
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	764 0, 0,
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	765 0, 0,
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	766 0, 0,
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	767 window->w, window->h);
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	768
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	769 }
4572 266ec93f49af Correctly handle the availability of Xrender in X11_CreateRenderer and X11_DisplayModeChanged. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4571 diff changeset	770 #endif
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	771 }
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	772 if (n > 0) {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	773 data->drawable = data->pixmaps[0];
4572 266ec93f49af Correctly handle the availability of Xrender in X11_CreateRenderer and X11_DisplayModeChanged. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4571 diff changeset	774 #ifdef SDL_VIDEO_DRIVER_X11_XRENDER
4577 87a2d87786d4 Modified configure.in to allow building with Xrender. Fixed all problems that prevented compilation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4576 diff changeset	775 data->drawable_pict = data->pixmap_picts[0];
4572 266ec93f49af Correctly handle the availability of Xrender in X11_CreateRenderer and X11_DisplayModeChanged. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4571 diff changeset	776 #endif
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	777 }
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	778 data->current_pixmap = 0;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	779
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	780 return 0;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	781 }
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	782
4593 3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	783 #ifdef SDL_VIDEO_DRIVER_X11_XRENDER
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	784 static void
4619 b9a205e6369f Moved brace to the beginning of the line for the beginning of functions Sam Lantinga <slouken@libsdl.org> parents: 4618 diff changeset	785 SDLMaskToXRenderMask(Uint32 sdl_mask, short comp, short compMask)
b9a205e6369f Moved brace to the beginning of the line for the beginning of functions Sam Lantinga <slouken@libsdl.org> parents: 4618 diff changeset	786 {
4610 32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	787 if (sdl_mask == 0) {
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	788 *comp = 0;
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	789 *compMask = 0;
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	790 } else {
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	791 (*comp) = 0;
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	792 (*compMask) = 0;
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	793 while(!(sdl_mask & 1)) {
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	794 (*comp)++;
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	795 sdl_mask >>= 1;
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	796 }
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	797 while(sdl_mask & 1) {
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	798 (compMask) = ((compMask) << 1) \| 1;
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	799 sdl_mask >>= 1;
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	800 }
4593 3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	801 }
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	802 }
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	803
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	804 static XRenderPictFormat*
4619 b9a205e6369f Moved brace to the beginning of the line for the beginning of functions Sam Lantinga <slouken@libsdl.org> parents: 4618 diff changeset	805 PixelFormatEnumToXRenderPictFormat(SDL_Renderer * renderer, Uint32 format)
b9a205e6369f Moved brace to the beginning of the line for the beginning of functions Sam Lantinga <slouken@libsdl.org> parents: 4618 diff changeset	806 {
4593 3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	807 XRenderPictFormat* pict_fmt = NULL;
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	808 X11_RenderData data = (X11_RenderData ) renderer->driverdata;
4610 32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	809
4593 3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	810 if (data->use_xrender) {
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	811
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	812 int bpp;
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	813 Uint32 Amask, Rmask, Gmask, Bmask;
4610 32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	814 if(!SDL_PixelFormatEnumToMasks(format, &bpp, &Rmask, &Gmask, &Bmask, &Amask)) {
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	815 SDL_SetError("Unknown pixel format");
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	816 return NULL;
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	817 }
4593 3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	818 XRenderPictFormat templ;
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	819 unsigned long mask = (PictFormatType \| PictFormatDepth \| PictFormatRed \|
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	820 PictFormatRedMask \| PictFormatGreen \| PictFormatGreenMask \|
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	821 PictFormatBlue \| PictFormatBlueMask \| PictFormatAlpha \|
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	822 PictFormatAlphaMask);
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	823
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	824 templ.type = PictTypeDirect;
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	825 templ.depth = bpp;
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	826 SDLMaskToXRenderMask(Amask, &(templ.direct.alpha), &(templ.direct.alphaMask));
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	827 SDLMaskToXRenderMask(Rmask, &(templ.direct.red), &(templ.direct.redMask));
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	828 SDLMaskToXRenderMask(Gmask, &(templ.direct.green), &(templ.direct.greenMask));
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	829 SDLMaskToXRenderMask(Bmask, &(templ.direct.blue), &(templ.direct.blueMask));
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	830 pict_fmt = XRenderFindFormat(data->display, mask, &templ, 0);
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	831 }
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	832
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	833 return pict_fmt;
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	834 }
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	835
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	836 static Visual*
4619 b9a205e6369f Moved brace to the beginning of the line for the beginning of functions Sam Lantinga <slouken@libsdl.org> parents: 4618 diff changeset	837 PixelFormatEnumToVisual(SDL_Renderer * renderer, Uint32 format)
b9a205e6369f Moved brace to the beginning of the line for the beginning of functions Sam Lantinga <slouken@libsdl.org> parents: 4618 diff changeset	838 {
4593 3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	839 X11_RenderData data = (X11_RenderData ) renderer->driverdata;
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	840
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	841 if (data->use_xrender) {
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	842 int bpp;
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	843 Uint32 Amask, Rmask, Gmask, Bmask;
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	844 SDL_PixelFormatEnumToMasks(format, &bpp, &Rmask, &Gmask, &Bmask, &Amask);
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	845
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	846 XVisualInfo vinfo_templ;
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	847 long vinfo_mask;
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	848 int nitems_return;
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	849
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	850 vinfo_mask = (VisualDepthMask \| VisualRedMaskMask \|
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	851 VisualGreenMaskMask \| VisualBlueMaskMask);
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	852 vinfo_templ.depth = bpp;
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	853 vinfo_templ.red_mask = Rmask;
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	854 vinfo_templ.green_mask = Gmask;
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	855 vinfo_templ.blue_mask = Bmask;
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	856
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	857 XVisualInfo * ret = XGetVisualInfo(data->display, vinfo_mask,
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	858 &vinfo_templ, &nitems_return);
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	859
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	860 if (nitems_return) {
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	861 return ret[0].visual;
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	862 }
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	863 }
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	864
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	865 return NULL;
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	866 }
4616 05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	867
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	868 static XRenderColor
4619 b9a205e6369f Moved brace to the beginning of the line for the beginning of functions Sam Lantinga <slouken@libsdl.org> parents: 4618 diff changeset	869 SDLColorToXRenderColor(Uint8 r, Uint8 g, Uint8 b, Uint8 a)
b9a205e6369f Moved brace to the beginning of the line for the beginning of functions Sam Lantinga <slouken@libsdl.org> parents: 4618 diff changeset	870 {
4616 05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	871 double rd, gd, bd, ad;
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	872 XRenderColor ret;
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	873 rd = r / 255.0;
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	874 gd = g / 255.0;
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	875 bd = b / 255.0;
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	876 ad = a / 255.0;
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	877
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	878 ret.red = (unsigned short) (rd * ad * 0xFFFF);
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	879 ret.green = (unsigned short) (gd * ad * 0xFFFF);
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	880 ret.blue = (unsigned short) (bd * ad * 0xFFFF);
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	881 ret.alpha = (unsigned short) (ad * 0xFFFF);
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	882
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	883 return ret;
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	884 }
4593 3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	885 #endif
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	886
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	887 static int
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	888 X11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	889 {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	890 X11_RenderData renderdata = (X11_RenderData ) renderer->driverdata;
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3596 diff changeset	891 SDL_Window *window = renderer->window;
64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3596 diff changeset	892 SDL_VideoDisplay *display = window->display;
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	893 X11_TextureData *data;
2916 ffdd533f7add Fixed pitch alignment problem causing MITSHM error on 16-bit displays Sam Lantinga <slouken@libsdl.org> parents: 2901 diff changeset	894 int pitch_alignmask = ((renderdata->scanline_pad / 8) - 1);
4593 3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	895 XGCValues gcv;
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	896
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	897 data = (X11_TextureData ) SDL_calloc(1, sizeof(data));
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	898 if (!data) {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	899 SDL_OutOfMemory();
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	900 return -1;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	901 }
4593 3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	902 data->depth = renderdata->depth;
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	903 data->visual = renderdata->visual;
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	904 data->gc = renderdata->gc;
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	905
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	906 texture->driverdata = data;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	907 if (SDL_ISPIXELFORMAT_FOURCC(texture->format)) {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	908 data->yuv =
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	909 SDL_SW_CreateYUVTexture(texture->format, texture->w, texture->h);
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	910 if (!data->yuv) {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	911 return -1;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	912 }
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	913 data->format = display->current_mode.format;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	914 } else {
4572 266ec93f49af Correctly handle the availability of Xrender in X11_CreateRenderer and X11_DisplayModeChanged. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4571 diff changeset	915 #ifdef SDL_VIDEO_DRIVER_X11_XRENDER
4610 32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	916 if (renderdata->use_xrender)
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	917 {
4593 3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	918 Uint32 Amask, Rmask, Gmask, Bmask;
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	919 SDL_PixelFormatEnumToMasks(texture->format, &(data->depth),
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	920 &Rmask, &Gmask, &Bmask, &Amask);
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	921 data->visual = PixelFormatEnumToVisual(renderer, texture->format);
4572 266ec93f49af Correctly handle the availability of Xrender in X11_CreateRenderer and X11_DisplayModeChanged. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4571 diff changeset	922 }
4610 32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	923 else
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	924 #endif
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	925 {
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	926 if (texture->format != display->current_mode.format)
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	927 {
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	928 SDL_SetError("Texture format doesn't match window format");
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	929 return -1;
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	930 }
2870 b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2868 diff changeset	931 }
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	932 data->format = texture->format;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	933 }
4610 32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	934
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	935 if (data->yuv \|\| texture->access == SDL_TEXTUREACCESS_STREAMING) {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	936 #ifndef NO_SHARED_MEMORY
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	937 XShmSegmentInfo *shminfo = &data->shminfo;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	938
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	939 shm_error = True;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	940
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	941 if (SDL_X11_HAVE_SHM) {
4610 32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	942 data->image =
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	943 XShmCreateImage(renderdata->display, data->visual,
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	944 data->depth, ZPixmap, NULL,
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	945 shminfo, texture->w, texture->h);
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	946 if (data->image) {
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	947 shminfo->shmid =
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	948 shmget(IPC_PRIVATE, texture->h * data->image->bytes_per_line,
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	949 IPC_CREAT \| 0777);
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	950 if (shminfo->shmid >= 0) {
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	951 shminfo->shmaddr = (char *) shmat(shminfo->shmid, 0, 0);
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	952 shminfo->readOnly = False;
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	953 if (shminfo->shmaddr != (char *) -1) {
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	954 shm_error = False;
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	955 X_handler = XSetErrorHandler(shm_errhandler);
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	956 XShmAttach(renderdata->display, shminfo);
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	957 XSync(renderdata->display, False);
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	958 XSetErrorHandler(X_handler);
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	959 if (shm_error) {
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	960 XShmDetach(renderdata->display, shminfo);
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	961 shmdt(shminfo->shmaddr);
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	962 XDestroyImage(data->image);
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	963 XSync(renderdata->display, False);
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	964 }
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	965 else {
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	966 data->pixels = data->image->data = shminfo->shmaddr;
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	967 shmctl(shminfo->shmid, IPC_RMID, NULL);
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	968 data->pixmap =
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	969 XCreatePixmap(renderdata->display, renderdata->xwindow,
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	970 texture->w, texture->h, data->depth);
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	971 if (!data->pixmap) {
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	972 SDL_SetError("XCreatePixmap() failed");
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	973 return -1;
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	974 }
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	975 }
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	976 }
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	977 }
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	978 }
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	979 }
4610 32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	980 if (shm_error) {
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	981 shminfo->shmaddr = NULL;
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	982 }
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	983 if (!data->image)
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	984 #endif /* not NO_SHARED_MEMORY */
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	985 {
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	986 data->image =
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	987 XCreateImage(renderdata->display, data->visual,
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	988 data->depth, ZPixmap, 0, NULL,
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	989 texture->w, texture->h,
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	990 SDL_BYTESPERPIXEL(data->format) * 8,
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	991 0);
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	992 if (!data->image) {
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	993 X11_DestroyTexture(renderer, texture);
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	994 SDL_SetError("XCreateImage() failed");
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	995 return -1;
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	996 }
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	997 data->pixels = SDL_malloc(texture->h * data->image->bytes_per_line);
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	998 if (!data->pixels) {
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	999 X11_DestroyTexture(renderer, texture);
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	1000 SDL_OutOfMemory();
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	1001 return -1;
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	1002 }
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	1003 data->image->data = data->pixels;
4587 25391ccf16a0 Texture rendering mostly works now. Even SDL_TEXTUREACCESS_STREAMING is supported now with a little overhead. Scaling of textures happens using XRender. :D Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4586 diff changeset	1004 data->pixmap =
25391ccf16a0 Texture rendering mostly works now. Even SDL_TEXTUREACCESS_STREAMING is supported now with a little overhead. Scaling of textures happens using XRender. :D Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4586 diff changeset	1005 XCreatePixmap(renderdata->display, renderdata->xwindow, texture->w,
4593 3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	1006 texture->h, data->depth);
4587 25391ccf16a0 Texture rendering mostly works now. Even SDL_TEXTUREACCESS_STREAMING is supported now with a little overhead. Scaling of textures happens using XRender. :D Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4586 diff changeset	1007 if (data->pixmap == None) {
25391ccf16a0 Texture rendering mostly works now. Even SDL_TEXTUREACCESS_STREAMING is supported now with a little overhead. Scaling of textures happens using XRender. :D Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4586 diff changeset	1008 X11_DestroyTexture(renderer, texture);
25391ccf16a0 Texture rendering mostly works now. Even SDL_TEXTUREACCESS_STREAMING is supported now with a little overhead. Scaling of textures happens using XRender. :D Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4586 diff changeset	1009 SDL_SetError("XCreatePixmap() failed");
25391ccf16a0 Texture rendering mostly works now. Even SDL_TEXTUREACCESS_STREAMING is supported now with a little overhead. Scaling of textures happens using XRender. :D Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4586 diff changeset	1010 return -1;
25391ccf16a0 Texture rendering mostly works now. Even SDL_TEXTUREACCESS_STREAMING is supported now with a little overhead. Scaling of textures happens using XRender. :D Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4586 diff changeset	1011 }
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1012 }
4947 619884e8a714 Fixed trying to create an XRender texture for YUV formats Sam Lantinga <slouken@libsdl.org> parents: 4929 diff changeset	1013 } else {
4610 32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	1014 data->image =
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	1015 XCreateImage(renderdata->display, data->visual,
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	1016 data->depth, ZPixmap, 0, NULL,
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	1017 texture->w, texture->h,
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	1018 SDL_BYTESPERPIXEL(data->format) * 8,
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	1019 0);
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	1020 if (!data->image) {
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	1021 X11_DestroyTexture(renderer, texture);
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	1022 SDL_SetError("XCreateImage() failed");
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	1023 return -1;
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	1024 }
2814 e841aa93e6be indent Sam Lantinga <slouken@libsdl.org> parents: 2811 diff changeset	1025 data->pixmap =
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3596 diff changeset	1026 XCreatePixmap(renderdata->display, renderdata->xwindow, texture->w,
4593 3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	1027 texture->h, data->depth);
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1028 if (data->pixmap == None) {
2868 3b595278f813 Fixed BadMatch error in X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	1029 X11_DestroyTexture(renderer, texture);
3044 b36579172f27 Changes to hopefully handle the creation of a colormap for 8 bit PseudoColor visuals in X11 Bob Pendleton <bob@pendleton.com> parents: 2967 diff changeset	1030 SDL_SetError("XCreatePixmap() failed");
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1031 return -1;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1032 }
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1033 }
4610 32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	1034
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	1035 data->pitch = data->image->bytes_per_line;
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	1036
4580 cfea5b007bc7 Fix the rendering color channels to be premultiplied with the alpha channel as thats what Xrender expects. Small fixes in X11_CreateTexture. Add some new functions in SDL_x11sym.h as well as support for Xrender. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4579 diff changeset	1037 #ifdef SDL_VIDEO_DRIVER_X11_XRENDER
4947 619884e8a714 Fixed trying to create an XRender texture for YUV formats Sam Lantinga <slouken@libsdl.org> parents: 4929 diff changeset	1038 if(renderdata->use_xrender && !data->yuv) {
4593 3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	1039 gcv.graphics_exposures = False;
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	1040 data->gc =
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	1041 XCreateGC(renderdata->display, data->pixmap, GCGraphicsExposures, &gcv);
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	1042 if (!data->gc) {
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	1043 SDL_SetError("XCreateGC() failed");
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	1044 return -1;
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	1045 }
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	1046 data->picture_fmt =
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	1047 PixelFormatEnumToXRenderPictFormat(renderer, texture->format);
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	1048 if (data->picture_fmt == NULL) {
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	1049 X11_DestroyTexture(renderer, texture);
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	1050 SDL_SetError("Texture format not supported by driver");
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	1051 return -1;
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	1052 }
4580 cfea5b007bc7 Fix the rendering color channels to be premultiplied with the alpha channel as thats what Xrender expects. Small fixes in X11_CreateTexture. Add some new functions in SDL_x11sym.h as well as support for Xrender. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4579 diff changeset	1053 data->picture =
4586 e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	1054 XRenderCreatePicture(renderdata->display, data->pixmap,
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	1055 data->picture_fmt, 0, NULL);
4593 3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	1056 if (!data->picture) {
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	1057 X11_DestroyTexture(renderer, texture);
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	1058 SDL_SetError("XRenderCreatePicture() failed");
4580 cfea5b007bc7 Fix the rendering color channels to be premultiplied with the alpha channel as thats what Xrender expects. Small fixes in X11_CreateTexture. Add some new functions in SDL_x11sym.h as well as support for Xrender. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4579 diff changeset	1059 return -1;
cfea5b007bc7 Fix the rendering color channels to be premultiplied with the alpha channel as thats what Xrender expects. Small fixes in X11_CreateTexture. Add some new functions in SDL_x11sym.h as well as support for Xrender. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4579 diff changeset	1060 }
4616 05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1061 data->modulated_pixmap =
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1062 XCreatePixmap(renderdata->display, renderdata->xwindow,
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1063 texture->w, texture->h, data->depth);
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1064 if (!data->modulated_pixmap) {
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1065 X11_DestroyTexture(renderer, texture);
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1066 SDL_SetError("XCreatePixmap() failed");
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1067 return -1;
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1068 }
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1069 data->modulated_picture =
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1070 XRenderCreatePicture(renderdata->display, data->modulated_pixmap,
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1071 data->picture_fmt, 0, NULL);
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1072 if (!data->modulated_picture) {
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1073 X11_DestroyTexture(renderer, texture);
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1074 SDL_SetError("XRenderCreatePicture() failed");
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1075 return -1;
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1076 }
4633 100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	1077 // FIXME: Is the following required?
100f7ab48946 Documentation and code safety updates. (x11 renderer) Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4632 diff changeset	1078 /* Set the default blending and scaling modes. */
4610 32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	1079 texture->blendMode = SDL_BLENDMODE_NONE;
4929 aa8888658021 Use the enumerated type for blend and scale mode instead of int Sam Lantinga <slouken@libsdl.org> parents: 4898 diff changeset	1080 texture->scaleMode = SDL_SCALEMODE_NONE;
4610 32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	1081 data->blend_op = PictOpSrc;
4629 44fd1f0b895a Fixed a huge bug with texture scaling. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4624 diff changeset	1082 data->filter = NULL;
4593 3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	1083 }
4580 cfea5b007bc7 Fix the rendering color channels to be premultiplied with the alpha channel as thats what Xrender expects. Small fixes in X11_CreateTexture. Add some new functions in SDL_x11sym.h as well as support for Xrender. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4579 diff changeset	1084 #endif
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1085 return 0;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1086 }
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1087
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1088 static int
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1089 X11_QueryTexturePixels(SDL_Renderer * renderer, SDL_Texture * texture,
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1090 void *pixels, int pitch)
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1091 {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1092 X11_TextureData data = (X11_TextureData ) texture->driverdata;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1093
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1094 if (data->yuv) {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1095 return SDL_SW_QueryYUVTexturePixels(data->yuv, pixels, pitch);
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1096 } else {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1097 *pixels = data->pixels;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1098 *pitch = data->pitch;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1099 return 0;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1100 }
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1101 }
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1102
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1103 static int
4616 05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1104 X11_SetTextureRGBAMod(SDL_Renderer * renderer, SDL_Texture * texture)
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1105 {
4620 f4a93bde905f Fixed compiling without XRender enabled Sam Lantinga <slouken@libsdl.org> parents: 4619 diff changeset	1106 #ifdef SDL_VIDEO_DRIVER_X11_XRENDER
4616 05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1107 X11_TextureData data = (X11_TextureData ) texture->driverdata;
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1108 X11_RenderData renderdata = (X11_RenderData ) renderer->driverdata;
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1109
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1110 if (renderdata->use_xrender) {
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1111
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1112 Uint8 r = 0xFF, g = 0xFF, b = 0xFF, a = 0xFF;
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1113
4617 cfbb1ff4b8ec Add some comments. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4616 diff changeset	1114 /* Check if alpha modulation is required. */
4616 05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1115 if (texture->modMode & SDL_TEXTUREMODULATE_ALPHA) {
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1116 a = texture->a;
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1117 }
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1118
4617 cfbb1ff4b8ec Add some comments. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4616 diff changeset	1119 /* Check if color modulation is required. */
4616 05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1120 if (texture->modMode & SDL_TEXTUREMODULATE_COLOR) {
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1121 r = texture->r;
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1122 g = texture->g;
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1123 b = texture->b;
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1124 }
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1125
4617 cfbb1ff4b8ec Add some comments. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4616 diff changeset	1126 /* We can save some labour if no modulation is required. */
4616 05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1127 if (texture->modMode != SDL_TEXTUREMODULATE_NONE) {
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1128 XRenderColor mod_color =
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1129 SDLColorToXRenderColor(r, g, b, a);
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1130 XRenderFillRectangle(renderdata->display, PictOpSrc,
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1131 renderdata->brush_pict, &mod_color,
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1132 0, 0, 1, 1);
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1133 }
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1134
4617 cfbb1ff4b8ec Add some comments. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4616 diff changeset	1135 /* We can save some labour dealing with component alpha
cfbb1ff4b8ec Add some comments. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4616 diff changeset	1136 * if color modulation is not required. */
4616 05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1137 XRenderPictureAttributes attr;
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1138 if (texture->modMode & SDL_TEXTUREMODULATE_COLOR) {
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1139 attr.component_alpha = True;
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1140 XRenderChangePicture(renderdata->display, renderdata->brush_pict,
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1141 CPComponentAlpha, &attr);
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1142 }
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1143
4617 cfbb1ff4b8ec Add some comments. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4616 diff changeset	1144 /* Again none of this is necessary is no modulation
cfbb1ff4b8ec Add some comments. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4616 diff changeset	1145 * is required. */
4616 05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1146 if (texture->modMode != SDL_TEXTUREMODULATE_NONE) {
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1147 XRenderComposite(renderdata->display, PictOpSrc,
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1148 data->picture, renderdata->brush_pict,
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1149 data->modulated_picture,
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1150 0, 0, 0, 0, 0, 0, texture->w, texture->h);
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1151 }
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1152
4617 cfbb1ff4b8ec Add some comments. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4616 diff changeset	1153 /* We only need to reset the component alpha
cfbb1ff4b8ec Add some comments. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4616 diff changeset	1154 * attribute if color modulation is required. */
4616 05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1155 if (texture->modMode & SDL_TEXTUREMODULATE_COLOR) {
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1156 attr.component_alpha = False;
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1157 XRenderChangePicture(renderdata->display, renderdata->brush_pict,
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1158 CPComponentAlpha, &attr);
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1159 }
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1160
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1161 return 0;
4620 f4a93bde905f Fixed compiling without XRender enabled Sam Lantinga <slouken@libsdl.org> parents: 4619 diff changeset	1162 } else {
4616 05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1163 SDL_Unsupported();
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1164 return -1;
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1165 }
4620 f4a93bde905f Fixed compiling without XRender enabled Sam Lantinga <slouken@libsdl.org> parents: 4619 diff changeset	1166 #else
f4a93bde905f Fixed compiling without XRender enabled Sam Lantinga <slouken@libsdl.org> parents: 4619 diff changeset	1167 SDL_Unsupported();
f4a93bde905f Fixed compiling without XRender enabled Sam Lantinga <slouken@libsdl.org> parents: 4619 diff changeset	1168 return -1;
f4a93bde905f Fixed compiling without XRender enabled Sam Lantinga <slouken@libsdl.org> parents: 4619 diff changeset	1169 #endif
4616 05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1170 }
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1171
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1172 static int
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1173 X11_SetTextureBlendMode(SDL_Renderer * renderer, SDL_Texture * texture)
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1174 {
4591 1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	1175 X11_TextureData data = (X11_TextureData ) texture->driverdata;
4606 4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	1176 X11_RenderData renderdata = (X11_RenderData ) renderer->driverdata;
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1177 switch (texture->blendMode) {
2884 9dde605c7540 Date: Fri, 19 Dec 2008 20:17:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2882 diff changeset	1178 case SDL_BLENDMODE_NONE:
4591 1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	1179 #ifdef SDL_VIDEO_DRIVER_X11_XRENDER
4606 4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	1180 if (renderdata->use_xrender) {
4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	1181 data->blend_op = PictOpSrc;
4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	1182 return 0;
4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	1183 }
4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	1184 case SDL_BLENDMODE_MOD:
4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	1185 case SDL_BLENDMODE_MASK:
4591 1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	1186 case SDL_BLENDMODE_BLEND:
4606 4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	1187 if (renderdata->use_xrender) {
4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	1188 data->blend_op = PictOpOver;
4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	1189 return 0;
4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	1190 }
4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	1191 case SDL_BLENDMODE_ADD:
4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	1192 if (renderdata->use_xrender) {
4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	1193 data->blend_op = PictOpAdd;
4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	1194 return 0;
4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	1195 }
4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	1196 #endif
4591 1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	1197 return 0;
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1198 default:
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1199 SDL_Unsupported();
2884 9dde605c7540 Date: Fri, 19 Dec 2008 20:17:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2882 diff changeset	1200 texture->blendMode = SDL_BLENDMODE_NONE;
4591 1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	1201 #ifdef SDL_VIDEO_DRIVER_X11_XRENDER
4606 4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	1202 if (renderdata->use_xrender) {
4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	1203 texture->blendMode = SDL_BLENDMODE_BLEND;
4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	1204 data->blend_op = PictOpOver;
4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	1205 }
4591 1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	1206 #endif
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1207 return -1;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1208 }
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1209 }
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1210
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1211 static int
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1212 X11_SetTextureScaleMode(SDL_Renderer * renderer, SDL_Texture * texture)
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1213 {
2828 7e5ff6cd05bf Added very slow software scaling to the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 2827 diff changeset	1214 X11_TextureData data = (X11_TextureData ) texture->driverdata;
4606 4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	1215 X11_RenderData renderdata = (X11_RenderData ) renderer->driverdata;
2828 7e5ff6cd05bf Added very slow software scaling to the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 2827 diff changeset	1216
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1217 switch (texture->scaleMode) {
4929 aa8888658021 Use the enumerated type for blend and scale mode instead of int Sam Lantinga <slouken@libsdl.org> parents: 4898 diff changeset	1218 case SDL_SCALEMODE_NONE:
4629 44fd1f0b895a Fixed a huge bug with texture scaling. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4624 diff changeset	1219 #ifdef SDL_VIDEO_DRIVER_X11_XRENDER
44fd1f0b895a Fixed a huge bug with texture scaling. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4624 diff changeset	1220 if (renderdata->use_xrender) {
44fd1f0b895a Fixed a huge bug with texture scaling. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4624 diff changeset	1221 data->filter = NULL;
44fd1f0b895a Fixed a huge bug with texture scaling. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4624 diff changeset	1222 }
44fd1f0b895a Fixed a huge bug with texture scaling. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4624 diff changeset	1223 #endif
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1224 return 0;
4929 aa8888658021 Use the enumerated type for blend and scale mode instead of int Sam Lantinga <slouken@libsdl.org> parents: 4898 diff changeset	1225 case SDL_SCALEMODE_FAST:
2828 7e5ff6cd05bf Added very slow software scaling to the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 2827 diff changeset	1226 /* We can sort of fake it for streaming textures */
7e5ff6cd05bf Added very slow software scaling to the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 2827 diff changeset	1227 if (data->yuv \|\| texture->access == SDL_TEXTUREACCESS_STREAMING) {
7e5ff6cd05bf Added very slow software scaling to the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 2827 diff changeset	1228 return 0;
7e5ff6cd05bf Added very slow software scaling to the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 2827 diff changeset	1229 }
4606 4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	1230 #ifdef SDL_VIDEO_DRIVER_X11_XRENDER
4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	1231 if (renderdata->use_xrender) {
4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	1232 data->filter = FilterFast;
4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	1233 return 0;
4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	1234 }
4929 aa8888658021 Use the enumerated type for blend and scale mode instead of int Sam Lantinga <slouken@libsdl.org> parents: 4898 diff changeset	1235 case SDL_SCALEMODE_SLOW:
4606 4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	1236 if (renderdata->use_xrender) {
4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	1237 data->filter = FilterGood;
4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	1238 return 0;
4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	1239 }
4929 aa8888658021 Use the enumerated type for blend and scale mode instead of int Sam Lantinga <slouken@libsdl.org> parents: 4898 diff changeset	1240 case SDL_SCALEMODE_BEST:
4606 4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	1241 if (renderdata->use_xrender) {
4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	1242 data->filter = FilterBest;
4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	1243 return 0;
4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	1244 }
4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	1245 #endif
4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	1246 /* Fall through to unsupported case */
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1247 default:
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1248 SDL_Unsupported();
4606 4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	1249 #ifdef SDL_VIDEO_DRIVER_X11_XRENDER
4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	1250 if (renderdata->use_xrender) {
4929 aa8888658021 Use the enumerated type for blend and scale mode instead of int Sam Lantinga <slouken@libsdl.org> parents: 4898 diff changeset	1251 texture->scaleMode = SDL_SCALEMODE_NONE;
4629 44fd1f0b895a Fixed a huge bug with texture scaling. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4624 diff changeset	1252 data->filter = NULL;
4606 4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	1253 }
4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	1254 else
4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	1255 #endif
4929 aa8888658021 Use the enumerated type for blend and scale mode instead of int Sam Lantinga <slouken@libsdl.org> parents: 4898 diff changeset	1256 texture->scaleMode = SDL_SCALEMODE_NONE;
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1257 return -1;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1258 }
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1259 return 0;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1260 }
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1261
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1262 static int
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1263 X11_UpdateTexture(SDL_Renderer * renderer, SDL_Texture * texture,
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1264 const SDL_Rect * rect, const void *pixels, int pitch)
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1265 {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1266 X11_TextureData data = (X11_TextureData ) texture->driverdata;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1267
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1268 if (data->yuv) {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1269 if (SDL_SW_UpdateYUVTexture(data->yuv, rect, pixels, pitch) < 0) {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1270 return -1;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1271 }
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1272 UpdateYUVTextureData(texture);
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1273 return 0;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1274 } else {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1275 X11_RenderData renderdata = (X11_RenderData ) renderer->driverdata;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1276
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1277 if (data->pixels) {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1278 Uint8 src, dst;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1279 int row;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1280 size_t length;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1281
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1282 src = (Uint8 *) pixels;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1283 dst =
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1284 (Uint8 ) data->pixels + rect->y data->pitch +
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1285 rect->x * SDL_BYTESPERPIXEL(texture->format);
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1286 length = rect->w * SDL_BYTESPERPIXEL(texture->format);
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1287 for (row = 0; row < rect->h; ++row) {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1288 SDL_memcpy(dst, src, length);
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1289 src += pitch;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1290 dst += data->pitch;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1291 }
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1292 } else {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1293 data->image->width = rect->w;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1294 data->image->height = rect->h;
2814 e841aa93e6be indent Sam Lantinga <slouken@libsdl.org> parents: 2811 diff changeset	1295 data->image->data = (char *) pixels;
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1296 data->image->bytes_per_line = pitch;
4593 3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	1297 XPutImage(renderdata->display, data->pixmap, data->gc,
2814 e841aa93e6be indent Sam Lantinga <slouken@libsdl.org> parents: 2811 diff changeset	1298 data->image, 0, 0, rect->x, rect->y, rect->w, rect->h);
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1299 }
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1300 return 0;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1301 }
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1302 }
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1303
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1304 static int
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1305 X11_LockTexture(SDL_Renderer * renderer, SDL_Texture * texture,
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1306 const SDL_Rect * rect, int markDirty, void **pixels,
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1307 int *pitch)
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1308 {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1309 X11_TextureData data = (X11_TextureData ) texture->driverdata;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1310
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1311 if (data->yuv) {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1312 return SDL_SW_LockYUVTexture(data->yuv, rect, markDirty, pixels,
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1313 pitch);
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1314 } else if (data->pixels) {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1315 *pixels =
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1316 (void ) ((Uint8 ) data->pixels + rect->y * data->pitch +
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1317 rect->x * SDL_BYTESPERPIXEL(texture->format));
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1318 *pitch = data->pitch;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1319 return 0;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1320 } else {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1321 SDL_SetError("No pixels available");
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1322 return -1;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1323 }
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1324 }
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1325
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1326 static void
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1327 X11_UnlockTexture(SDL_Renderer * renderer, SDL_Texture * texture)
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1328 {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1329 X11_TextureData data = (X11_TextureData ) texture->driverdata;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1330
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1331 if (data->yuv) {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1332 SDL_SW_UnlockYUVTexture(data->yuv);
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1333 UpdateYUVTextureData(texture);
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1334 }
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1335 }
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1336
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1337 static int
2884 9dde605c7540 Date: Fri, 19 Dec 2008 20:17:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2882 diff changeset	1338 X11_SetDrawBlendMode(SDL_Renderer * renderer)
9dde605c7540 Date: Fri, 19 Dec 2008 20:17:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2882 diff changeset	1339 {
4588 0ddd78496d68 Preliminary support for blending modes on drawing operations. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4587 diff changeset	1340 X11_RenderData data = (X11_RenderData ) renderer->driverdata;
2884 9dde605c7540 Date: Fri, 19 Dec 2008 20:17:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2882 diff changeset	1341 switch (renderer->blendMode) {
9dde605c7540 Date: Fri, 19 Dec 2008 20:17:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2882 diff changeset	1342 case SDL_BLENDMODE_NONE:
4588 0ddd78496d68 Preliminary support for blending modes on drawing operations. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4587 diff changeset	1343 #ifdef SDL_VIDEO_DRIVER_X11_XRENDER
4590 1ad70fb49fcb Fix so many things that there is little place in this column to list them all but the result is that blending modes just work now for drawing primitives. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4589 diff changeset	1344 //PictOpSrc
4588 0ddd78496d68 Preliminary support for blending modes on drawing operations. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4587 diff changeset	1345 data->blend_op = PictOpSrc;
2884 9dde605c7540 Date: Fri, 19 Dec 2008 20:17:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2882 diff changeset	1346 return 0;
4606 4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	1347 case SDL_BLENDMODE_MOD:
4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	1348 case SDL_BLENDMODE_MASK:
4590 1ad70fb49fcb Fix so many things that there is little place in this column to list them all but the result is that blending modes just work now for drawing primitives. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4589 diff changeset	1349 case SDL_BLENDMODE_BLEND: // PictOpOver
1ad70fb49fcb Fix so many things that there is little place in this column to list them all but the result is that blending modes just work now for drawing primitives. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4589 diff changeset	1350 data->blend_op = PictOpOver;
4588 0ddd78496d68 Preliminary support for blending modes on drawing operations. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4587 diff changeset	1351 return 0;
4581 ef0aa488fff6 Fix X11_FillRects to work with double buffering as well as triple buffering. This requires that the buffer pixmap be cleared after every render. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4580 diff changeset	1352 case SDL_BLENDMODE_ADD: // PictOpAdd
4588 0ddd78496d68 Preliminary support for blending modes on drawing operations. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4587 diff changeset	1353 data->blend_op = PictOpAdd;
0ddd78496d68 Preliminary support for blending modes on drawing operations. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4587 diff changeset	1354 return 0;
4581 ef0aa488fff6 Fix X11_FillRects to work with double buffering as well as triple buffering. This requires that the buffer pixmap be cleared after every render. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4580 diff changeset	1355 /* FIXME case SDL_BLENDMODE_MOD: */
ef0aa488fff6 Fix X11_FillRects to work with double buffering as well as triple buffering. This requires that the buffer pixmap be cleared after every render. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4580 diff changeset	1356 #endif
ef0aa488fff6 Fix X11_FillRects to work with double buffering as well as triple buffering. This requires that the buffer pixmap be cleared after every render. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4580 diff changeset	1357 return 0;
2884 9dde605c7540 Date: Fri, 19 Dec 2008 20:17:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2882 diff changeset	1358 default:
9dde605c7540 Date: Fri, 19 Dec 2008 20:17:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2882 diff changeset	1359 SDL_Unsupported();
4589 8d8a889530eb Fix blending modes for primitives. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4588 diff changeset	1360 #ifdef SDL_VIDEO_DRIVER_X11_XRENDER
4590 1ad70fb49fcb Fix so many things that there is little place in this column to list them all but the result is that blending modes just work now for drawing primitives. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4589 diff changeset	1361 if(data->use_xrender) {
1ad70fb49fcb Fix so many things that there is little place in this column to list them all but the result is that blending modes just work now for drawing primitives. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4589 diff changeset	1362 renderer->blendMode = SDL_BLENDMODE_BLEND;
1ad70fb49fcb Fix so many things that there is little place in this column to list them all but the result is that blending modes just work now for drawing primitives. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4589 diff changeset	1363 data->blend_op = PictOpOver;
1ad70fb49fcb Fix so many things that there is little place in this column to list them all but the result is that blending modes just work now for drawing primitives. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4589 diff changeset	1364 }
1ad70fb49fcb Fix so many things that there is little place in this column to list them all but the result is that blending modes just work now for drawing primitives. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4589 diff changeset	1365 else
4589 8d8a889530eb Fix blending modes for primitives. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4588 diff changeset	1366 #endif
4590 1ad70fb49fcb Fix so many things that there is little place in this column to list them all but the result is that blending modes just work now for drawing primitives. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4589 diff changeset	1367 {
1ad70fb49fcb Fix so many things that there is little place in this column to list them all but the result is that blending modes just work now for drawing primitives. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4589 diff changeset	1368 renderer->blendMode = SDL_BLENDMODE_NONE;
1ad70fb49fcb Fix so many things that there is little place in this column to list them all but the result is that blending modes just work now for drawing primitives. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4589 diff changeset	1369 }
2884 9dde605c7540 Date: Fri, 19 Dec 2008 20:17:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2882 diff changeset	1370 return -1;
9dde605c7540 Date: Fri, 19 Dec 2008 20:17:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2882 diff changeset	1371 }
9dde605c7540 Date: Fri, 19 Dec 2008 20:17:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2882 diff changeset	1372 }
9dde605c7540 Date: Fri, 19 Dec 2008 20:17:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2882 diff changeset	1373
9dde605c7540 Date: Fri, 19 Dec 2008 20:17:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2882 diff changeset	1374 static Uint32
9dde605c7540 Date: Fri, 19 Dec 2008 20:17:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2882 diff changeset	1375 renderdrawcolor(SDL_Renderer * renderer, int premult)
9dde605c7540 Date: Fri, 19 Dec 2008 20:17:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2882 diff changeset	1376 {
9dde605c7540 Date: Fri, 19 Dec 2008 20:17:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2882 diff changeset	1377 X11_RenderData data = (X11_RenderData ) renderer->driverdata;
9dde605c7540 Date: Fri, 19 Dec 2008 20:17:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2882 diff changeset	1378 Uint8 r = renderer->r;
9dde605c7540 Date: Fri, 19 Dec 2008 20:17:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2882 diff changeset	1379 Uint8 g = renderer->g;
9dde605c7540 Date: Fri, 19 Dec 2008 20:17:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2882 diff changeset	1380 Uint8 b = renderer->b;
9dde605c7540 Date: Fri, 19 Dec 2008 20:17:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2882 diff changeset	1381 Uint8 a = renderer->a;
9dde605c7540 Date: Fri, 19 Dec 2008 20:17:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2882 diff changeset	1382 if (premult)
2967 e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2927 diff changeset	1383 return SDL_MapRGBA(&data->format, ((int) r * (int) a) / 255,
2884 9dde605c7540 Date: Fri, 19 Dec 2008 20:17:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2882 diff changeset	1384 ((int) g * (int) a) / 255,
9dde605c7540 Date: Fri, 19 Dec 2008 20:17:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2882 diff changeset	1385 ((int) b * (int) a) / 255, 255);
9dde605c7540 Date: Fri, 19 Dec 2008 20:17:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2882 diff changeset	1386 else
2967 e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2927 diff changeset	1387 return SDL_MapRGBA(&data->format, r, g, b, a);
2884 9dde605c7540 Date: Fri, 19 Dec 2008 20:17:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2882 diff changeset	1388 }
9dde605c7540 Date: Fri, 19 Dec 2008 20:17:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2882 diff changeset	1389
4620 f4a93bde905f Fixed compiling without XRender enabled Sam Lantinga <slouken@libsdl.org> parents: 4619 diff changeset	1390 #ifdef SDL_VIDEO_DRIVER_X11_XRENDER
4583 5c925d4f220f X11_DrawRects now uses a very hacky way of drawing rectangles with XRender. This will be improved in some time. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4582 diff changeset	1391 static XRenderColor
5c925d4f220f X11_DrawRects now uses a very hacky way of drawing rectangles with XRender. This will be improved in some time. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4582 diff changeset	1392 xrenderdrawcolor(SDL_Renderer *renderer)
5c925d4f220f X11_DrawRects now uses a very hacky way of drawing rectangles with XRender. This will be improved in some time. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4582 diff changeset	1393 {
5c925d4f220f X11_DrawRects now uses a very hacky way of drawing rectangles with XRender. This will be improved in some time. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4582 diff changeset	1394 XRenderColor xrender_color;
4616 05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1395 if(renderer->blendMode == SDL_BLENDMODE_NONE) {
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1396 xrender_color =
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1397 SDLColorToXRenderColor(renderer->r, renderer->g, renderer->b, 0xFF);
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1398 }
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1399 else {
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1400 xrender_color =
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1401 SDLColorToXRenderColor(renderer->r, renderer->g, renderer->b, renderer->a);
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1402 }
4583 5c925d4f220f X11_DrawRects now uses a very hacky way of drawing rectangles with XRender. This will be improved in some time. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4582 diff changeset	1403 return xrender_color;
5c925d4f220f X11_DrawRects now uses a very hacky way of drawing rectangles with XRender. This will be improved in some time. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4582 diff changeset	1404 }
4620 f4a93bde905f Fixed compiling without XRender enabled Sam Lantinga <slouken@libsdl.org> parents: 4619 diff changeset	1405 #endif
4583 5c925d4f220f X11_DrawRects now uses a very hacky way of drawing rectangles with XRender. This will be improved in some time. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4582 diff changeset	1406
2884 9dde605c7540 Date: Fri, 19 Dec 2008 20:17:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2882 diff changeset	1407 static int
3596 f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3559 diff changeset	1408 X11_RenderDrawPoints(SDL_Renderer * renderer, const SDL_Point * points,
f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3559 diff changeset	1409 int count)
2901 133601e3b255 Added RenderPiont() API Sam Lantinga <slouken@libsdl.org> parents: 2894 diff changeset	1410 {
133601e3b255 Added RenderPiont() API Sam Lantinga <slouken@libsdl.org> parents: 2894 diff changeset	1411 X11_RenderData data = (X11_RenderData ) renderer->driverdata;
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3596 diff changeset	1412 SDL_Window *window = renderer->window;
3538 a1896642a47e X11 driver compiles again, lines are not yet implemented Sam Lantinga <slouken@libsdl.org> parents: 3520 diff changeset	1413 XPoint xpoints, xpoint;
a1896642a47e X11 driver compiles again, lines are not yet implemented Sam Lantinga <slouken@libsdl.org> parents: 3520 diff changeset	1414 int i, xcount;
4603 dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1415 SDL_Rect clip;
2901 133601e3b255 Added RenderPiont() API Sam Lantinga <slouken@libsdl.org> parents: 2894 diff changeset	1416
4597 95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1417 clip.x = 0;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1418 clip.y = 0;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1419 clip.w = window->w;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1420 clip.h = window->h;
4598 66e13a224bd6 Major changes to drawing. Reverted back to core X11 functions due to regressions. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4597 diff changeset	1421 if (data->makedirty) {
4603 dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1422 SDL_Rect rect;
4597 95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1423
4598 66e13a224bd6 Major changes to drawing. Reverted back to core X11 functions due to regressions. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4597 diff changeset	1424 /* Get the smallest rectangle that contains everything */
66e13a224bd6 Major changes to drawing. Reverted back to core X11 functions due to regressions. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4597 diff changeset	1425 rect.x = 0;
66e13a224bd6 Major changes to drawing. Reverted back to core X11 functions due to regressions. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4597 diff changeset	1426 rect.y = 0;
66e13a224bd6 Major changes to drawing. Reverted back to core X11 functions due to regressions. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4597 diff changeset	1427 rect.w = window->w;
66e13a224bd6 Major changes to drawing. Reverted back to core X11 functions due to regressions. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4597 diff changeset	1428 rect.h = window->h;
66e13a224bd6 Major changes to drawing. Reverted back to core X11 functions due to regressions. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4597 diff changeset	1429 if (!SDL_EnclosePoints(points, count, &rect, &rect)) {
66e13a224bd6 Major changes to drawing. Reverted back to core X11 functions due to regressions. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4597 diff changeset	1430 /* Nothing to draw */
66e13a224bd6 Major changes to drawing. Reverted back to core X11 functions due to regressions. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4597 diff changeset	1431 return 0;
66e13a224bd6 Major changes to drawing. Reverted back to core X11 functions due to regressions. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4597 diff changeset	1432 }
66e13a224bd6 Major changes to drawing. Reverted back to core X11 functions due to regressions. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4597 diff changeset	1433 SDL_AddDirtyRect(&data->dirty, &rect);
66e13a224bd6 Major changes to drawing. Reverted back to core X11 functions due to regressions. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4597 diff changeset	1434 }
4597 95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1435 {
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1436 xpoint = xpoints = SDL_stack_alloc(XPoint, count);
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1437 xcount = 0;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1438 for (i = 0; i < count; ++i) {
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1439 int x = points[i].x;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1440 int y = points[i].y;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1441 if (x < 0 \|\| x >= window->w \|\| y < 0 \|\| y >= window->h) {
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1442 continue;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1443 }
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1444 xpoint->x = (short)x;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1445 xpoint->y = (short)y;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1446 ++xpoint;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1447 ++xcount;
3538 a1896642a47e X11 driver compiles again, lines are not yet implemented Sam Lantinga <slouken@libsdl.org> parents: 3520 diff changeset	1448 }
4602 4fbf64d504cf Use XDamage to optimise drawing operations. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4600 diff changeset	1449
4597 95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1450 #ifdef SDL_VIDEO_DRIVER_X11_XRENDER
4603 dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1451 if (data->use_xrender &&
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1452 (renderer->blendMode != SDL_BLENDMODE_NONE) &&
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1453 !(renderer->a == 0xFF &&
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1454 renderer->blendMode != SDL_BLENDMODE_ADD &&
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1455 renderer->blendMode != SDL_BLENDMODE_MOD))
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1456 {
4607 9e9ec5e3be95 Get SDL_BLENDMODE_MOD to work! Tested on nvidia only ATM. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4606 diff changeset	1457 XSetForeground(data->display, data->stencil_gc, 0);
4603 dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1458 #ifdef SDL_VIDEO_DRIVER_X11_XDAMAGE
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1459 if (data->use_xdamage)
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1460 {
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1461 /* Update only those parts which were changed
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1462 * in the previous drawing operation */
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1463 XFixesSetGCClipRegion(data->display, data->stencil_gc,
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1464 0, 0, data->stencil_parts);
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1465 }
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1466 #endif
4597 95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1467 XFillRectangle(data->display, data->stencil, data->stencil_gc,
4603 dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1468 0, 0, window->w, window->h);
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1469 #ifdef SDL_VIDEO_DRIVER_X11_XDAMAGE
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1470 if (data->use_xdamage)
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1471 {
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1472 XFixesSetGCClipRegion(data->display, data->stencil_gc, 0, 0, None);
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1473 }
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1474 #endif
4607 9e9ec5e3be95 Get SDL_BLENDMODE_MOD to work! Tested on nvidia only ATM. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4606 diff changeset	1475 XSetForeground(data->display, data->stencil_gc, 0xFFFFFFFF);
4603 dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1476
4597 95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1477 XDrawPoints(data->display, data->stencil, data->stencil_gc, xpoints, xcount,
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1478 CoordModeOrigin);
4603 dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1479 #ifdef SDL_VIDEO_DRIVER_X11_XDAMAGE
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1480 if (data->use_xdamage)
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1481 {
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1482 /* Store the damaged region in stencil_parts */
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1483 XDamageSubtract(data->display, data->stencil_damage, None, data->stencil_parts);
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1484 }
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1485 #endif
4597 95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1486 }
4602 4fbf64d504cf Use XDamage to optimise drawing operations. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4600 diff changeset	1487 #endif
3538 a1896642a47e X11 driver compiles again, lines are not yet implemented Sam Lantinga <slouken@libsdl.org> parents: 3520 diff changeset	1488 }
4602 4fbf64d504cf Use XDamage to optimise drawing operations. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4600 diff changeset	1489
4585 21600c6d6445 X11_RenderDrawLines and X11_RenderDrawPoints use XRender now. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4584 diff changeset	1490 #ifdef SDL_VIDEO_DRIVER_X11_XRENDER
4603 dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1491 if (data->use_xrender &&
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1492 (renderer->blendMode != SDL_BLENDMODE_NONE) &&
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1493 !(renderer->a == 0xFF &&
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1494 renderer->blendMode != SDL_BLENDMODE_ADD &&
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1495 renderer->blendMode != SDL_BLENDMODE_MOD))
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1496 {
4587 25391ccf16a0 Texture rendering mostly works now. Even SDL_TEXTUREACCESS_STREAMING is supported now with a little overhead. Scaling of textures happens using XRender. :D Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4586 diff changeset	1497 XRenderColor foreground;
25391ccf16a0 Texture rendering mostly works now. Even SDL_TEXTUREACCESS_STREAMING is supported now with a little overhead. Scaling of textures happens using XRender. :D Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4586 diff changeset	1498 foreground = xrenderdrawcolor(renderer);
4603 dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1499
4597 95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1500 XRenderFillRectangle(data->display, PictOpSrc, data->brush_pict,
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1501 &foreground, 0, 0, 1, 1);
4603 dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1502 #ifdef SDL_VIDEO_DRIVER_X11_XDAMAGE
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1503 if (data->use_xdamage)
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1504 {
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1505 /* Update only those parts which drawn
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1506 * to in the current drawing operation */
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1507 XFixesSetPictureClipRegion(data->display, data->drawable_pict,
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1508 0, 0, data->stencil_parts);
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1509 }
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1510 #endif
4597 95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1511 XRenderComposite(data->display, data->blend_op, data->brush_pict,
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1512 data->stencil_pict, data->drawable_pict,
4603 dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1513 0, 0, 0, 0, 0, 0, window->w, window->h);
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1514 #ifdef SDL_VIDEO_DRIVER_X11_XDAMAGE
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1515 if (data->use_xdamage)
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1516 {
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1517 XFixesSetPictureClipRegion(data->display, data->drawable_pict, 0, 0, None);
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1518 }
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1519 #endif
4585 21600c6d6445 X11_RenderDrawLines and X11_RenderDrawPoints use XRender now. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4584 diff changeset	1520 }
21600c6d6445 X11_RenderDrawLines and X11_RenderDrawPoints use XRender now. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4584 diff changeset	1521 else
21600c6d6445 X11_RenderDrawLines and X11_RenderDrawPoints use XRender now. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4584 diff changeset	1522 #endif
21600c6d6445 X11_RenderDrawLines and X11_RenderDrawPoints use XRender now. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4584 diff changeset	1523 {
21600c6d6445 X11_RenderDrawLines and X11_RenderDrawPoints use XRender now. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4584 diff changeset	1524 unsigned long foreground = renderdrawcolor(renderer, 1);
21600c6d6445 X11_RenderDrawLines and X11_RenderDrawPoints use XRender now. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4584 diff changeset	1525 XSetForeground(data->display, data->gc, foreground);
21600c6d6445 X11_RenderDrawLines and X11_RenderDrawPoints use XRender now. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4584 diff changeset	1526
21600c6d6445 X11_RenderDrawLines and X11_RenderDrawPoints use XRender now. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4584 diff changeset	1527
21600c6d6445 X11_RenderDrawLines and X11_RenderDrawPoints use XRender now. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4584 diff changeset	1528 if (xcount > 0) {
21600c6d6445 X11_RenderDrawLines and X11_RenderDrawPoints use XRender now. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4584 diff changeset	1529 XDrawPoints(data->display, data->drawable, data->gc, xpoints, xcount,
21600c6d6445 X11_RenderDrawLines and X11_RenderDrawPoints use XRender now. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4584 diff changeset	1530 CoordModeOrigin);
21600c6d6445 X11_RenderDrawLines and X11_RenderDrawPoints use XRender now. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4584 diff changeset	1531 }
3538 a1896642a47e X11 driver compiles again, lines are not yet implemented Sam Lantinga <slouken@libsdl.org> parents: 3520 diff changeset	1532 }
4597 95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1533
3538 a1896642a47e X11 driver compiles again, lines are not yet implemented Sam Lantinga <slouken@libsdl.org> parents: 3520 diff changeset	1534 SDL_stack_free(xpoints);
a1896642a47e X11 driver compiles again, lines are not yet implemented Sam Lantinga <slouken@libsdl.org> parents: 3520 diff changeset	1535
2894 e80f347b6d29 Added missing return Sam Lantinga <slouken@libsdl.org> parents: 2888 diff changeset	1536 return 0;
2884 9dde605c7540 Date: Fri, 19 Dec 2008 20:17:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2882 diff changeset	1537 }
9dde605c7540 Date: Fri, 19 Dec 2008 20:17:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2882 diff changeset	1538
9dde605c7540 Date: Fri, 19 Dec 2008 20:17:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2882 diff changeset	1539 static int
3596 f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3559 diff changeset	1540 X11_RenderDrawLines(SDL_Renderer * renderer, const SDL_Point * points,
f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3559 diff changeset	1541 int count)
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1542 {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1543 X11_RenderData data = (X11_RenderData ) renderer->driverdata;
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3596 diff changeset	1544 SDL_Window *window = renderer->window;
4458 c9584df65367 Removed unused variables Sam Lantinga <slouken@libsdl.org> parents: 3697 diff changeset	1545 SDL_Rect clip;
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1546 unsigned long foreground;
3543 c2154674c0c1 Fixed X11 line implementation - clip lines that are going to go outside the window. Sam Lantinga <slouken@libsdl.org> parents: 3538 diff changeset	1547 XPoint xpoints, xpoint;
c2154674c0c1 Fixed X11 line implementation - clip lines that are going to go outside the window. Sam Lantinga <slouken@libsdl.org> parents: 3538 diff changeset	1548 int i, xcount;
c2154674c0c1 Fixed X11 line implementation - clip lines that are going to go outside the window. Sam Lantinga <slouken@libsdl.org> parents: 3538 diff changeset	1549 int minx, miny;
c2154674c0c1 Fixed X11 line implementation - clip lines that are going to go outside the window. Sam Lantinga <slouken@libsdl.org> parents: 3538 diff changeset	1550 int maxx, maxy;
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1551
3538 a1896642a47e X11 driver compiles again, lines are not yet implemented Sam Lantinga <slouken@libsdl.org> parents: 3520 diff changeset	1552 clip.x = 0;
a1896642a47e X11 driver compiles again, lines are not yet implemented Sam Lantinga <slouken@libsdl.org> parents: 3520 diff changeset	1553 clip.y = 0;
a1896642a47e X11 driver compiles again, lines are not yet implemented Sam Lantinga <slouken@libsdl.org> parents: 3520 diff changeset	1554 clip.w = window->w;
a1896642a47e X11 driver compiles again, lines are not yet implemented Sam Lantinga <slouken@libsdl.org> parents: 3520 diff changeset	1555 clip.h = window->h;
4585 21600c6d6445 X11_RenderDrawLines and X11_RenderDrawPoints use XRender now. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4584 diff changeset	1556 {
4597 95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1557 Pixmap drawable;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1558 GC gc;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1559 #ifdef SDL_VIDEO_DRIVER_X11_XRENDER
4603 dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1560 if (data->use_xrender &&
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1561 (renderer->blendMode != SDL_BLENDMODE_NONE) &&
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1562 !(renderer->a == 0xFF &&
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1563 renderer->blendMode != SDL_BLENDMODE_ADD &&
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1564 renderer->blendMode != SDL_BLENDMODE_MOD))
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1565 {
4597 95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1566 drawable = data->stencil;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1567 gc = data->stencil_gc;
4603 dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1568
4607 9e9ec5e3be95 Get SDL_BLENDMODE_MOD to work! Tested on nvidia only ATM. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4606 diff changeset	1569 XSetForeground(data->display, data->stencil_gc, 0);
4603 dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1570 #ifdef SDL_VIDEO_DRIVER_X11_XDAMAGE
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1571 if (data->use_xdamage)
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1572 XFixesSetGCClipRegion(data->display, data->stencil_gc,
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1573 0, 0, data->stencil_parts);
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1574 #endif
4597 95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1575 XFillRectangle(data->display, data->stencil, data->stencil_gc,
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1576 0, 0, window->w, window->h);
4603 dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1577 #ifdef SDL_VIDEO_DRIVER_X11_XDAMAGE
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1578 if (data->use_xdamage)
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1579 XFixesSetGCClipRegion(data->display, data->stencil_gc,
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1580 0, 0, None);
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1581 #endif
4607 9e9ec5e3be95 Get SDL_BLENDMODE_MOD to work! Tested on nvidia only ATM. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4606 diff changeset	1582 XSetForeground(data->display, data->stencil_gc, 0xFFFFFFFF);
4597 95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1583 }
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1584 else
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1585 #endif
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1586 {
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1587 drawable = data->drawable;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1588 gc = data->gc;
3543 c2154674c0c1 Fixed X11 line implementation - clip lines that are going to go outside the window. Sam Lantinga <slouken@libsdl.org> parents: 3538 diff changeset	1589 }
c2154674c0c1 Fixed X11 line implementation - clip lines that are going to go outside the window. Sam Lantinga <slouken@libsdl.org> parents: 3538 diff changeset	1590
4597 95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1591 foreground = renderdrawcolor(renderer, 1);
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1592 XSetForeground(data->display, data->gc, foreground);
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1593
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1594 xpoint = xpoints = SDL_stack_alloc(XPoint, count);
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1595 xcount = 0;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1596 minx = INT_MAX;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1597 miny = INT_MAX;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1598 maxx = INT_MIN;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1599 maxy = INT_MIN;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1600 for (i = 0; i < count; ++i) {
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1601 int x = points[i].x;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1602 int y = points[i].y;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1603
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1604 /* If the point is inside the window, add it to the list */
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1605 if (x >= 0 && x < window->w && y >= 0 && y < window->h) {
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1606 if (x < minx) {
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1607 minx = x;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1608 } else if (x > maxx) {
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1609 maxx = x;
3543 c2154674c0c1 Fixed X11 line implementation - clip lines that are going to go outside the window. Sam Lantinga <slouken@libsdl.org> parents: 3538 diff changeset	1610 }
4597 95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1611 if (y < miny) {
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1612 miny = y;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1613 } else if (y > maxy) {
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1614 maxy = y;
3543 c2154674c0c1 Fixed X11 line implementation - clip lines that are going to go outside the window. Sam Lantinga <slouken@libsdl.org> parents: 3538 diff changeset	1615 }
4597 95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1616 xpoint->x = (short)x;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1617 xpoint->y = (short)y;
3543 c2154674c0c1 Fixed X11 line implementation - clip lines that are going to go outside the window. Sam Lantinga <slouken@libsdl.org> parents: 3538 diff changeset	1618 ++xpoint;
c2154674c0c1 Fixed X11 line implementation - clip lines that are going to go outside the window. Sam Lantinga <slouken@libsdl.org> parents: 3538 diff changeset	1619 ++xcount;
4597 95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1620 continue;
3543 c2154674c0c1 Fixed X11 line implementation - clip lines that are going to go outside the window. Sam Lantinga <slouken@libsdl.org> parents: 3538 diff changeset	1621 }
4597 95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1622
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1623 /* We need to clip the line segments joined by this point */
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1624 if (xcount > 0) {
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1625 int x1 = xpoint[-1].x;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1626 int y1 = xpoint[-1].y;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1627 int x2 = x;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1628 int y2 = y;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1629 if (SDL_IntersectRectAndLine(&clip, &x1, &y1, &x2, &y2)) {
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1630 if (x2 < minx) {
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1631 minx = x2;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1632 } else if (x2 > maxx) {
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1633 maxx = x2;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1634 }
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1635 if (y2 < miny) {
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1636 miny = y2;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1637 } else if (y2 > maxy) {
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1638 maxy = y2;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1639 }
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1640 xpoint->x = (short)x2;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1641 xpoint->y = (short)y2;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1642 ++xpoint;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1643 ++xcount;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1644 }
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1645 XDrawLines(data->display, drawable, gc,
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1646 xpoints, xcount, CoordModeOrigin);
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1647 if (xpoints[0].x != x2 \|\| xpoints[0].y != y2) {
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1648 XDrawPoint(data->display, drawable, gc, x2, y2);
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1649 }
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1650 if (data->makedirty) {
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1651 SDL_Rect rect;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1652
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1653 rect.x = minx;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1654 rect.y = miny;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1655 rect.w = (maxx - minx) + 1;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1656 rect.h = (maxy - miny) + 1;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1657 SDL_AddDirtyRect(&data->dirty, &rect);
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1658 }
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1659 xpoint = xpoints;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1660 xcount = 0;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1661 minx = INT_MAX;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1662 miny = INT_MAX;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1663 maxx = INT_MIN;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1664 maxy = INT_MIN;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1665 }
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1666 if (i < (count-1)) {
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1667 int x1 = x;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1668 int y1 = y;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1669 int x2 = points[i+1].x;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1670 int y2 = points[i+1].y;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1671 if (SDL_IntersectRectAndLine(&clip, &x1, &y1, &x2, &y2)) {
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1672 if (x1 < minx) {
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1673 minx = x1;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1674 } else if (x1 > maxx) {
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1675 maxx = x1;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1676 }
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1677 if (y1 < miny) {
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1678 miny = y1;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1679 } else if (y1 > maxy) {
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1680 maxy = y1;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1681 }
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1682 xpoint->x = (short)x1;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1683 xpoint->y = (short)y1;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1684 ++xpoint;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1685 ++xcount;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1686 }
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1687 }
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1688 }
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1689 if (xcount > 1) {
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1690 int x2 = xpoint[-1].x;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1691 int y2 = xpoint[-1].y;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1692 XDrawLines(data->display, drawable, gc, xpoints, xcount,
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1693 CoordModeOrigin);
3543 c2154674c0c1 Fixed X11 line implementation - clip lines that are going to go outside the window. Sam Lantinga <slouken@libsdl.org> parents: 3538 diff changeset	1694 if (xpoints[0].x != x2 \|\| xpoints[0].y != y2) {
4585 21600c6d6445 X11_RenderDrawLines and X11_RenderDrawPoints use XRender now. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4584 diff changeset	1695 XDrawPoint(data->display, drawable, gc, x2, y2);
3543 c2154674c0c1 Fixed X11 line implementation - clip lines that are going to go outside the window. Sam Lantinga <slouken@libsdl.org> parents: 3538 diff changeset	1696 }
c2154674c0c1 Fixed X11 line implementation - clip lines that are going to go outside the window. Sam Lantinga <slouken@libsdl.org> parents: 3538 diff changeset	1697 if (data->makedirty) {
c2154674c0c1 Fixed X11 line implementation - clip lines that are going to go outside the window. Sam Lantinga <slouken@libsdl.org> parents: 3538 diff changeset	1698 SDL_Rect rect;
c2154674c0c1 Fixed X11 line implementation - clip lines that are going to go outside the window. Sam Lantinga <slouken@libsdl.org> parents: 3538 diff changeset	1699
c2154674c0c1 Fixed X11 line implementation - clip lines that are going to go outside the window. Sam Lantinga <slouken@libsdl.org> parents: 3538 diff changeset	1700 rect.x = minx;
c2154674c0c1 Fixed X11 line implementation - clip lines that are going to go outside the window. Sam Lantinga <slouken@libsdl.org> parents: 3538 diff changeset	1701 rect.y = miny;
c2154674c0c1 Fixed X11 line implementation - clip lines that are going to go outside the window. Sam Lantinga <slouken@libsdl.org> parents: 3538 diff changeset	1702 rect.w = (maxx - minx) + 1;
c2154674c0c1 Fixed X11 line implementation - clip lines that are going to go outside the window. Sam Lantinga <slouken@libsdl.org> parents: 3538 diff changeset	1703 rect.h = (maxy - miny) + 1;
c2154674c0c1 Fixed X11 line implementation - clip lines that are going to go outside the window. Sam Lantinga <slouken@libsdl.org> parents: 3538 diff changeset	1704 SDL_AddDirtyRect(&data->dirty, &rect);
c2154674c0c1 Fixed X11 line implementation - clip lines that are going to go outside the window. Sam Lantinga <slouken@libsdl.org> parents: 3538 diff changeset	1705 }
c2154674c0c1 Fixed X11 line implementation - clip lines that are going to go outside the window. Sam Lantinga <slouken@libsdl.org> parents: 3538 diff changeset	1706 }
c2154674c0c1 Fixed X11 line implementation - clip lines that are going to go outside the window. Sam Lantinga <slouken@libsdl.org> parents: 3538 diff changeset	1707 }
4585 21600c6d6445 X11_RenderDrawLines and X11_RenderDrawPoints use XRender now. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4584 diff changeset	1708 #ifdef SDL_VIDEO_DRIVER_X11_XRENDER
4603 dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1709 if (data->use_xrender &&
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1710 (renderer->blendMode != SDL_BLENDMODE_NONE) &&
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1711 !(renderer->a == 0xFF &&
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1712 renderer->blendMode != SDL_BLENDMODE_ADD &&
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1713 renderer->blendMode != SDL_BLENDMODE_MOD))
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1714 {
4585 21600c6d6445 X11_RenderDrawLines and X11_RenderDrawPoints use XRender now. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4584 diff changeset	1715 XRenderColor xrforeground = xrenderdrawcolor(renderer);
4597 95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1716 XRenderFillRectangle(data->display, PictOpSrc, data->brush_pict,
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1717 &xrforeground, 0, 0, 1, 1);
4603 dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1718 #ifdef SDL_VIDEO_DRIVER_X11_XDAMAGE
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1719 if (data->use_xdamage)
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1720 {
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1721 XDamageSubtract(data->display, data->stencil_damage, None, data->stencil_parts);
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1722
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1723 XFixesSetPictureClipRegion(data->display, data->drawable_pict,
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1724 0, 0, data->stencil_parts);
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1725 }
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1726 #endif
4597 95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1727 XRenderComposite(data->display, data->blend_op, data->brush_pict,
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1728 data->stencil_pict, data->drawable_pict,
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1729 0, 0, 0, 0, 0, 0, window->w, window->h);
4603 dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1730 #ifdef SDL_VIDEO_DRIVER_X11_XDAMAGE
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1731 if (data->use_xdamage)
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1732 XFixesSetPictureClipRegion(data->display, data->drawable_pict,
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1733 0, 0, None);
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1734 #endif
4585 21600c6d6445 X11_RenderDrawLines and X11_RenderDrawPoints use XRender now. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4584 diff changeset	1735 }
21600c6d6445 X11_RenderDrawLines and X11_RenderDrawPoints use XRender now. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4584 diff changeset	1736 #endif
3543 c2154674c0c1 Fixed X11 line implementation - clip lines that are going to go outside the window. Sam Lantinga <slouken@libsdl.org> parents: 3538 diff changeset	1737 SDL_stack_free(xpoints);
c2154674c0c1 Fixed X11 line implementation - clip lines that are going to go outside the window. Sam Lantinga <slouken@libsdl.org> parents: 3538 diff changeset	1738
3538 a1896642a47e X11 driver compiles again, lines are not yet implemented Sam Lantinga <slouken@libsdl.org> parents: 3520 diff changeset	1739 return 0;
a1896642a47e X11 driver compiles again, lines are not yet implemented Sam Lantinga <slouken@libsdl.org> parents: 3520 diff changeset	1740 }
a1896642a47e X11 driver compiles again, lines are not yet implemented Sam Lantinga <slouken@libsdl.org> parents: 3520 diff changeset	1741
a1896642a47e X11 driver compiles again, lines are not yet implemented Sam Lantinga <slouken@libsdl.org> parents: 3520 diff changeset	1742 static int
3596 f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3559 diff changeset	1743 X11_RenderDrawRects(SDL_Renderer * renderer, const SDL_Rect ** rects, int count)
f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3559 diff changeset	1744 {
f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3559 diff changeset	1745 X11_RenderData data = (X11_RenderData ) renderer->driverdata;
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3596 diff changeset	1746 SDL_Window *window = renderer->window;
3596 f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3559 diff changeset	1747 SDL_Rect clip, rect;
4584 9907c8cc6015 X11_RenderFillRects and X11_RenderDrawRects use a server side mask pixmap of 1 bit depth now. All drawing on these pixmaps is done by server side functions such as XDrawRectangles and XFillRectangles. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4583 diff changeset	1748 int i, xcount;
3596 f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3559 diff changeset	1749 XRectangle xrects, xrect;
4587 25391ccf16a0 Texture rendering mostly works now. Even SDL_TEXTUREACCESS_STREAMING is supported now with a little overhead. Scaling of textures happens using XRender. :D Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4586 diff changeset	1750 xrect = xrects = SDL_stack_alloc(XRectangle, count);
25391ccf16a0 Texture rendering mostly works now. Even SDL_TEXTUREACCESS_STREAMING is supported now with a little overhead. Scaling of textures happens using XRender. :D Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4586 diff changeset	1751 xcount = 0;
4590 1ad70fb49fcb Fix so many things that there is little place in this column to list them all but the result is that blending modes just work now for drawing primitives. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4589 diff changeset	1752
1ad70fb49fcb Fix so many things that there is little place in this column to list them all but the result is that blending modes just work now for drawing primitives. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4589 diff changeset	1753 clip.x = 0;
1ad70fb49fcb Fix so many things that there is little place in this column to list them all but the result is that blending modes just work now for drawing primitives. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4589 diff changeset	1754 clip.y = 0;
1ad70fb49fcb Fix so many things that there is little place in this column to list them all but the result is that blending modes just work now for drawing primitives. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4589 diff changeset	1755 clip.w = window->w;
1ad70fb49fcb Fix so many things that there is little place in this column to list them all but the result is that blending modes just work now for drawing primitives. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4589 diff changeset	1756 clip.h = window->h;
4597 95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1757 {
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1758
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1759 for (i = 0; i < count; ++i) {
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1760 if (!SDL_IntersectRect(rects[i], &clip, &rect)) {
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1761 continue;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1762 }
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1763
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1764 xrect->x = (short)rect.x;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1765 xrect->y = (short)rect.y;
4615 789483a20081 Fixed drawing rectangles. X is evil! Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4614 diff changeset	1766 xrect->width = (unsigned short)rect.w - 1;
789483a20081 Fixed drawing rectangles. X is evil! Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4614 diff changeset	1767 xrect->height = (unsigned short)rect.h - 1;
4597 95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1768 ++xrect;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1769 ++xcount;
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1770
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1771 if (data->makedirty) {
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1772 SDL_AddDirtyRect(&data->dirty, &rect);
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1773 }
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1774 }
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1775 #ifdef SDL_VIDEO_DRIVER_X11_XRENDER
4603 dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1776 if (data->use_xrender &&
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1777 (renderer->blendMode != SDL_BLENDMODE_NONE) &&
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1778 !(renderer->a == 0xFF &&
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1779 renderer->blendMode != SDL_BLENDMODE_ADD &&
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1780 renderer->blendMode != SDL_BLENDMODE_MOD))
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1781 {
4607 9e9ec5e3be95 Get SDL_BLENDMODE_MOD to work! Tested on nvidia only ATM. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4606 diff changeset	1782 XSetForeground(data->display, data->stencil_gc, 0);
4603 dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1783 #ifdef SDL_VIDEO_DRIVER_X11_XDAMAGE
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1784 if (data->use_xdamage)
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1785 XFixesSetGCClipRegion(data->display, data->stencil_gc,
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1786 0, 0, data->stencil_parts);
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1787 #endif
4597 95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1788 XFillRectangle(data->display, data->stencil, data->stencil_gc,
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1789 0, 0, window->w, window->h);
4603 dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1790 #ifdef SDL_VIDEO_DRIVER_X11_XDAMAGE
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1791 if (data->use_xdamage)
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1792 XFixesSetGCClipRegion(data->display, data->stencil_gc,
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1793 0, 0, None);
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1794 #endif
4607 9e9ec5e3be95 Get SDL_BLENDMODE_MOD to work! Tested on nvidia only ATM. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4606 diff changeset	1795 XSetForeground(data->display, data->stencil_gc, 0xFFFFFFFF);
4597 95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1796
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1797 XDrawRectangles(data->display, data->stencil, data->stencil_gc, xrects, xcount);
4603 dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1798
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1799 #ifdef SDL_VIDEO_DRIVER_X11_XDAMAGE
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1800 if (data->use_xdamage)
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1801 XDamageSubtract(data->display, data->stencil_damage,
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1802 None, data->stencil_parts);
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1803 #endif
4597 95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1804 }
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1805 #endif
4598 66e13a224bd6 Major changes to drawing. Reverted back to core X11 functions due to regressions. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4597 diff changeset	1806 }
4597 95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1807 #ifdef SDL_VIDEO_DRIVER_X11_XRENDER
4603 dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1808 if (data->use_xrender &&
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1809 (renderer->blendMode != SDL_BLENDMODE_NONE) &&
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1810 !(renderer->a == 0xFF &&
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1811 renderer->blendMode != SDL_BLENDMODE_ADD &&
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1812 renderer->blendMode != SDL_BLENDMODE_MOD))
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1813 {
4584 9907c8cc6015 X11_RenderFillRects and X11_RenderDrawRects use a server side mask pixmap of 1 bit depth now. All drawing on these pixmaps is done by server side functions such as XDrawRectangles and XFillRectangles. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4583 diff changeset	1814 XRenderColor foreground;
9907c8cc6015 X11_RenderFillRects and X11_RenderDrawRects use a server side mask pixmap of 1 bit depth now. All drawing on these pixmaps is done by server side functions such as XDrawRectangles and XFillRectangles. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4583 diff changeset	1815 foreground = xrenderdrawcolor(renderer);
4597 95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1816 XRenderFillRectangle(data->display, PictOpSrc, data->brush_pict,
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1817 &foreground, 0, 0, 1, 1);
4603 dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1818 #ifdef SDL_VIDEO_DRIVER_X11_XDAMAGE
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1819 if (data->use_xdamage)
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1820 XFixesSetPictureClipRegion(data->display, data->drawable_pict,
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1821 0, 0, data->stencil_parts);
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1822 #endif
4597 95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1823 XRenderComposite(data->display, data->blend_op, data->brush_pict,
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1824 data->stencil_pict, data->drawable_pict,
95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1825 0, 0, 0, 0, 0, 0, window->w, window->h);
4603 dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1826 #ifdef SDL_VIDEO_DRIVER_X11_XDAMAGE
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1827 if (data->use_xdamage)
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1828 XFixesSetPictureClipRegion(data->display, data->drawable_pict,
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1829 0, 0, None);
dffa432f0e2b Massive speed-up. Fixed the format that is set for the renderer. Included runtime checks for XDamage. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4602 diff changeset	1830 #endif
4583 5c925d4f220f X11_DrawRects now uses a very hacky way of drawing rectangles with XRender. This will be improved in some time. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4582 diff changeset	1831 }
5c925d4f220f X11_DrawRects now uses a very hacky way of drawing rectangles with XRender. This will be improved in some time. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4582 diff changeset	1832 else
5c925d4f220f X11_DrawRects now uses a very hacky way of drawing rectangles with XRender. This will be improved in some time. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4582 diff changeset	1833 #endif
5c925d4f220f X11_DrawRects now uses a very hacky way of drawing rectangles with XRender. This will be improved in some time. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4582 diff changeset	1834 {
4584 9907c8cc6015 X11_RenderFillRects and X11_RenderDrawRects use a server side mask pixmap of 1 bit depth now. All drawing on these pixmaps is done by server side functions such as XDrawRectangles and XFillRectangles. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4583 diff changeset	1835 unsigned long foreground;
9907c8cc6015 X11_RenderFillRects and X11_RenderDrawRects use a server side mask pixmap of 1 bit depth now. All drawing on these pixmaps is done by server side functions such as XDrawRectangles and XFillRectangles. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4583 diff changeset	1836
4583 5c925d4f220f X11_DrawRects now uses a very hacky way of drawing rectangles with XRender. This will be improved in some time. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4582 diff changeset	1837 foreground = renderdrawcolor(renderer, 1);
5c925d4f220f X11_DrawRects now uses a very hacky way of drawing rectangles with XRender. This will be improved in some time. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4582 diff changeset	1838 XSetForeground(data->display, data->gc, foreground);
5c925d4f220f X11_DrawRects now uses a very hacky way of drawing rectangles with XRender. This will be improved in some time. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4582 diff changeset	1839
5c925d4f220f X11_DrawRects now uses a very hacky way of drawing rectangles with XRender. This will be improved in some time. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4582 diff changeset	1840 if (xcount > 0) {
5c925d4f220f X11_DrawRects now uses a very hacky way of drawing rectangles with XRender. This will be improved in some time. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4582 diff changeset	1841 XDrawRectangles(data->display, data->drawable, data->gc,
5c925d4f220f X11_DrawRects now uses a very hacky way of drawing rectangles with XRender. This will be improved in some time. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4582 diff changeset	1842 xrects, xcount);
3596 f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3559 diff changeset	1843 }
f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3559 diff changeset	1844 }
4583 5c925d4f220f X11_DrawRects now uses a very hacky way of drawing rectangles with XRender. This will be improved in some time. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4582 diff changeset	1845 SDL_stack_free(xrects);
3596 f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3559 diff changeset	1846
f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3559 diff changeset	1847 return 0;
f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3559 diff changeset	1848 }
f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3559 diff changeset	1849
f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3559 diff changeset	1850 static int
f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3559 diff changeset	1851 X11_RenderFillRects(SDL_Renderer * renderer, const SDL_Rect ** rects, int count)
3538 a1896642a47e X11 driver compiles again, lines are not yet implemented Sam Lantinga <slouken@libsdl.org> parents: 3520 diff changeset	1852 {
a1896642a47e X11 driver compiles again, lines are not yet implemented Sam Lantinga <slouken@libsdl.org> parents: 3520 diff changeset	1853 X11_RenderData data = (X11_RenderData ) renderer->driverdata;
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3596 diff changeset	1854 SDL_Window *window = renderer->window;
3538 a1896642a47e X11 driver compiles again, lines are not yet implemented Sam Lantinga <slouken@libsdl.org> parents: 3520 diff changeset	1855 SDL_Rect clip, rect;
4584 9907c8cc6015 X11_RenderFillRects and X11_RenderDrawRects use a server side mask pixmap of 1 bit depth now. All drawing on these pixmaps is done by server side functions such as XDrawRectangles and XFillRectangles. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4583 diff changeset	1856
3538 a1896642a47e X11 driver compiles again, lines are not yet implemented Sam Lantinga <slouken@libsdl.org> parents: 3520 diff changeset	1857 clip.x = 0;
a1896642a47e X11 driver compiles again, lines are not yet implemented Sam Lantinga <slouken@libsdl.org> parents: 3520 diff changeset	1858 clip.y = 0;
a1896642a47e X11 driver compiles again, lines are not yet implemented Sam Lantinga <slouken@libsdl.org> parents: 3520 diff changeset	1859 clip.w = window->w;
a1896642a47e X11 driver compiles again, lines are not yet implemented Sam Lantinga <slouken@libsdl.org> parents: 3520 diff changeset	1860 clip.h = window->h;
4597 95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1861
4584 9907c8cc6015 X11_RenderFillRects and X11_RenderDrawRects use a server side mask pixmap of 1 bit depth now. All drawing on these pixmaps is done by server side functions such as XDrawRectangles and XFillRectangles. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4583 diff changeset	1862 int i, xcount;
9907c8cc6015 X11_RenderFillRects and X11_RenderDrawRects use a server side mask pixmap of 1 bit depth now. All drawing on these pixmaps is done by server side functions such as XDrawRectangles and XFillRectangles. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4583 diff changeset	1863 XRectangle xrects, xrect;
3538 a1896642a47e X11 driver compiles again, lines are not yet implemented Sam Lantinga <slouken@libsdl.org> parents: 3520 diff changeset	1864 xrect = xrects = SDL_stack_alloc(XRectangle, count);
a1896642a47e X11 driver compiles again, lines are not yet implemented Sam Lantinga <slouken@libsdl.org> parents: 3520 diff changeset	1865 xcount = 0;
4587 25391ccf16a0 Texture rendering mostly works now. Even SDL_TEXTUREACCESS_STREAMING is supported now with a little overhead. Scaling of textures happens using XRender. :D Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4586 diff changeset	1866 for (i = 0; i < count; ++i) {
25391ccf16a0 Texture rendering mostly works now. Even SDL_TEXTUREACCESS_STREAMING is supported now with a little overhead. Scaling of textures happens using XRender. :D Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4586 diff changeset	1867 if (!SDL_IntersectRect(rects[i], &clip, &rect)) {
25391ccf16a0 Texture rendering mostly works now. Even SDL_TEXTUREACCESS_STREAMING is supported now with a little overhead. Scaling of textures happens using XRender. :D Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4586 diff changeset	1868 continue;
25391ccf16a0 Texture rendering mostly works now. Even SDL_TEXTUREACCESS_STREAMING is supported now with a little overhead. Scaling of textures happens using XRender. :D Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4586 diff changeset	1869 }
25391ccf16a0 Texture rendering mostly works now. Even SDL_TEXTUREACCESS_STREAMING is supported now with a little overhead. Scaling of textures happens using XRender. :D Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4586 diff changeset	1870
25391ccf16a0 Texture rendering mostly works now. Even SDL_TEXTUREACCESS_STREAMING is supported now with a little overhead. Scaling of textures happens using XRender. :D Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4586 diff changeset	1871 xrect->x = (short)rect.x;
25391ccf16a0 Texture rendering mostly works now. Even SDL_TEXTUREACCESS_STREAMING is supported now with a little overhead. Scaling of textures happens using XRender. :D Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4586 diff changeset	1872 xrect->y = (short)rect.y;
25391ccf16a0 Texture rendering mostly works now. Even SDL_TEXTUREACCESS_STREAMING is supported now with a little overhead. Scaling of textures happens using XRender. :D Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4586 diff changeset	1873 xrect->width = (unsigned short)rect.w;
25391ccf16a0 Texture rendering mostly works now. Even SDL_TEXTUREACCESS_STREAMING is supported now with a little overhead. Scaling of textures happens using XRender. :D Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4586 diff changeset	1874 xrect->height = (unsigned short)rect.h;
25391ccf16a0 Texture rendering mostly works now. Even SDL_TEXTUREACCESS_STREAMING is supported now with a little overhead. Scaling of textures happens using XRender. :D Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4586 diff changeset	1875 ++xrect;
25391ccf16a0 Texture rendering mostly works now. Even SDL_TEXTUREACCESS_STREAMING is supported now with a little overhead. Scaling of textures happens using XRender. :D Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4586 diff changeset	1876 ++xcount;
25391ccf16a0 Texture rendering mostly works now. Even SDL_TEXTUREACCESS_STREAMING is supported now with a little overhead. Scaling of textures happens using XRender. :D Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4586 diff changeset	1877
25391ccf16a0 Texture rendering mostly works now. Even SDL_TEXTUREACCESS_STREAMING is supported now with a little overhead. Scaling of textures happens using XRender. :D Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4586 diff changeset	1878 if (data->makedirty) {
25391ccf16a0 Texture rendering mostly works now. Even SDL_TEXTUREACCESS_STREAMING is supported now with a little overhead. Scaling of textures happens using XRender. :D Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4586 diff changeset	1879 SDL_AddDirtyRect(&data->dirty, &rect);
25391ccf16a0 Texture rendering mostly works now. Even SDL_TEXTUREACCESS_STREAMING is supported now with a little overhead. Scaling of textures happens using XRender. :D Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4586 diff changeset	1880 }
25391ccf16a0 Texture rendering mostly works now. Even SDL_TEXTUREACCESS_STREAMING is supported now with a little overhead. Scaling of textures happens using XRender. :D Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4586 diff changeset	1881 }
4584 9907c8cc6015 X11_RenderFillRects and X11_RenderDrawRects use a server side mask pixmap of 1 bit depth now. All drawing on these pixmaps is done by server side functions such as XDrawRectangles and XFillRectangles. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4583 diff changeset	1882
9907c8cc6015 X11_RenderFillRects and X11_RenderDrawRects use a server side mask pixmap of 1 bit depth now. All drawing on these pixmaps is done by server side functions such as XDrawRectangles and XFillRectangles. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4583 diff changeset	1883 #ifdef SDL_VIDEO_DRIVER_X11_XRENDER
4597 95be206b3cb7 Start experimental branch for client-side rasterization. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4596 diff changeset	1884 if (data->use_xrender) {
4584 9907c8cc6015 X11_RenderFillRects and X11_RenderDrawRects use a server side mask pixmap of 1 bit depth now. All drawing on these pixmaps is done by server side functions such as XDrawRectangles and XFillRectangles. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4583 diff changeset	1885 XRenderColor foreground;
9907c8cc6015 X11_RenderFillRects and X11_RenderDrawRects use a server side mask pixmap of 1 bit depth now. All drawing on these pixmaps is done by server side functions such as XDrawRectangles and XFillRectangles. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4583 diff changeset	1886 foreground = xrenderdrawcolor(renderer);
4598 66e13a224bd6 Major changes to drawing. Reverted back to core X11 functions due to regressions. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4597 diff changeset	1887 if (xcount == 1) {
66e13a224bd6 Major changes to drawing. Reverted back to core X11 functions due to regressions. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4597 diff changeset	1888 XRenderFillRectangle(data->display, data->blend_op, data->drawable_pict,
66e13a224bd6 Major changes to drawing. Reverted back to core X11 functions due to regressions. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4597 diff changeset	1889 &foreground, xrects[0].x, xrects[0].y,
66e13a224bd6 Major changes to drawing. Reverted back to core X11 functions due to regressions. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4597 diff changeset	1890 xrects[0].width, xrects[0].height);
66e13a224bd6 Major changes to drawing. Reverted back to core X11 functions due to regressions. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4597 diff changeset	1891 }
66e13a224bd6 Major changes to drawing. Reverted back to core X11 functions due to regressions. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4597 diff changeset	1892 else if (xcount > 1) {
66e13a224bd6 Major changes to drawing. Reverted back to core X11 functions due to regressions. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4597 diff changeset	1893 XRenderFillRectangles(data->display, data->blend_op, data->drawable_pict,
66e13a224bd6 Major changes to drawing. Reverted back to core X11 functions due to regressions. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4597 diff changeset	1894 &foreground, xrects, xcount);
66e13a224bd6 Major changes to drawing. Reverted back to core X11 functions due to regressions. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4597 diff changeset	1895 }
3538 a1896642a47e X11 driver compiles again, lines are not yet implemented Sam Lantinga <slouken@libsdl.org> parents: 3520 diff changeset	1896 }
4584 9907c8cc6015 X11_RenderFillRects and X11_RenderDrawRects use a server side mask pixmap of 1 bit depth now. All drawing on these pixmaps is done by server side functions such as XDrawRectangles and XFillRectangles. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4583 diff changeset	1897 else
9907c8cc6015 X11_RenderFillRects and X11_RenderDrawRects use a server side mask pixmap of 1 bit depth now. All drawing on these pixmaps is done by server side functions such as XDrawRectangles and XFillRectangles. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4583 diff changeset	1898 #endif
9907c8cc6015 X11_RenderFillRects and X11_RenderDrawRects use a server side mask pixmap of 1 bit depth now. All drawing on these pixmaps is done by server side functions such as XDrawRectangles and XFillRectangles. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4583 diff changeset	1899 {
9907c8cc6015 X11_RenderFillRects and X11_RenderDrawRects use a server side mask pixmap of 1 bit depth now. All drawing on these pixmaps is done by server side functions such as XDrawRectangles and XFillRectangles. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4583 diff changeset	1900 unsigned long foreground;
4587 25391ccf16a0 Texture rendering mostly works now. Even SDL_TEXTUREACCESS_STREAMING is supported now with a little overhead. Scaling of textures happens using XRender. :D Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4586 diff changeset	1901
4584 9907c8cc6015 X11_RenderFillRects and X11_RenderDrawRects use a server side mask pixmap of 1 bit depth now. All drawing on these pixmaps is done by server side functions such as XDrawRectangles and XFillRectangles. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4583 diff changeset	1902 foreground = renderdrawcolor(renderer, 1);
9907c8cc6015 X11_RenderFillRects and X11_RenderDrawRects use a server side mask pixmap of 1 bit depth now. All drawing on these pixmaps is done by server side functions such as XDrawRectangles and XFillRectangles. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4583 diff changeset	1903 XSetForeground(data->display, data->gc, foreground);
4587 25391ccf16a0 Texture rendering mostly works now. Even SDL_TEXTUREACCESS_STREAMING is supported now with a little overhead. Scaling of textures happens using XRender. :D Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4586 diff changeset	1904
3538 a1896642a47e X11 driver compiles again, lines are not yet implemented Sam Lantinga <slouken@libsdl.org> parents: 3520 diff changeset	1905 XFillRectangles(data->display, data->drawable, data->gc,
a1896642a47e X11 driver compiles again, lines are not yet implemented Sam Lantinga <slouken@libsdl.org> parents: 3520 diff changeset	1906 xrects, xcount);
a1896642a47e X11 driver compiles again, lines are not yet implemented Sam Lantinga <slouken@libsdl.org> parents: 3520 diff changeset	1907 }
4587 25391ccf16a0 Texture rendering mostly works now. Even SDL_TEXTUREACCESS_STREAMING is supported now with a little overhead. Scaling of textures happens using XRender. :D Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4586 diff changeset	1908
25391ccf16a0 Texture rendering mostly works now. Even SDL_TEXTUREACCESS_STREAMING is supported now with a little overhead. Scaling of textures happens using XRender. :D Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4586 diff changeset	1909 SDL_stack_free(xrects);
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1910 return 0;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1911 }
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1912
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1913 static int
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1914 X11_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture,
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1915 const SDL_Rect * srcrect, const SDL_Rect * dstrect)
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1916 {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1917 X11_RenderData data = (X11_RenderData ) renderer->driverdata;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1918 X11_TextureData texturedata = (X11_TextureData ) texture->driverdata;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1919
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1920 if (data->makedirty) {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1921 SDL_AddDirtyRect(&data->dirty, dstrect);
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1922 }
4586 e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	1923 #ifdef SDL_VIDEO_DRIVER_X11_XRENDER
4947 619884e8a714 Fixed trying to create an XRender texture for YUV formats Sam Lantinga <slouken@libsdl.org> parents: 4929 diff changeset	1924 if (data->use_xrender && !texturedata->yuv) {
4587 25391ccf16a0 Texture rendering mostly works now. Even SDL_TEXTUREACCESS_STREAMING is supported now with a little overhead. Scaling of textures happens using XRender. :D Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4586 diff changeset	1925 if(texture->access == SDL_TEXTUREACCESS_STREAMING) {
25391ccf16a0 Texture rendering mostly works now. Even SDL_TEXTUREACCESS_STREAMING is supported now with a little overhead. Scaling of textures happens using XRender. :D Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4586 diff changeset	1926 #ifndef NO_SHARED_MEMORY
25391ccf16a0 Texture rendering mostly works now. Even SDL_TEXTUREACCESS_STREAMING is supported now with a little overhead. Scaling of textures happens using XRender. :D Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4586 diff changeset	1927 if(texturedata->shminfo.shmaddr) {
4610 32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	1928 XShmPutImage(data->display, texturedata->pixmap, texturedata->gc,
4587 25391ccf16a0 Texture rendering mostly works now. Even SDL_TEXTUREACCESS_STREAMING is supported now with a little overhead. Scaling of textures happens using XRender. :D Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4586 diff changeset	1929 texturedata->image, srcrect->x, srcrect->y,
25391ccf16a0 Texture rendering mostly works now. Even SDL_TEXTUREACCESS_STREAMING is supported now with a little overhead. Scaling of textures happens using XRender. :D Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4586 diff changeset	1930 srcrect->x, srcrect->y, srcrect->w, srcrect->h,
25391ccf16a0 Texture rendering mostly works now. Even SDL_TEXTUREACCESS_STREAMING is supported now with a little overhead. Scaling of textures happens using XRender. :D Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4586 diff changeset	1931 False);
25391ccf16a0 Texture rendering mostly works now. Even SDL_TEXTUREACCESS_STREAMING is supported now with a little overhead. Scaling of textures happens using XRender. :D Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4586 diff changeset	1932 }
25391ccf16a0 Texture rendering mostly works now. Even SDL_TEXTUREACCESS_STREAMING is supported now with a little overhead. Scaling of textures happens using XRender. :D Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4586 diff changeset	1933 else
25391ccf16a0 Texture rendering mostly works now. Even SDL_TEXTUREACCESS_STREAMING is supported now with a little overhead. Scaling of textures happens using XRender. :D Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4586 diff changeset	1934 #endif
25391ccf16a0 Texture rendering mostly works now. Even SDL_TEXTUREACCESS_STREAMING is supported now with a little overhead. Scaling of textures happens using XRender. :D Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4586 diff changeset	1935 if (texturedata->pixels) {
4610 32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	1936 XPutImage(data->display, texturedata->pixmap, texturedata->gc,
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	1937 texturedata->image, srcrect->x, srcrect->y, srcrect->x,
32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	1938 srcrect->y, srcrect->w, srcrect->h);
4587 25391ccf16a0 Texture rendering mostly works now. Even SDL_TEXTUREACCESS_STREAMING is supported now with a little overhead. Scaling of textures happens using XRender. :D Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4586 diff changeset	1939 }
4610 32991e17e2b6 Make the SW renderer work properly by fixing support for textures with no alpha channels. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4609 diff changeset	1940 XSync(data->display, False);
4587 25391ccf16a0 Texture rendering mostly works now. Even SDL_TEXTUREACCESS_STREAMING is supported now with a little overhead. Scaling of textures happens using XRender. :D Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4586 diff changeset	1941 }
4616 05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1942 Picture src, mask;
4606 4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	1943 XRenderPictureAttributes attr;
4607 9e9ec5e3be95 Get SDL_BLENDMODE_MOD to work! Tested on nvidia only ATM. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4606 diff changeset	1944 const SDL_Rect *mrect;
4630 02895e9c796b Added some comments. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4629 diff changeset	1945 /* mrect is the rectangular area of the mask
02895e9c796b Added some comments. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4629 diff changeset	1946 * picture that is aligned with the source. */
4616 05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1947
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1948 if (texture->modMode == SDL_TEXTUREMODULATE_NONE) {
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1949 src = texturedata->picture;
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1950 }
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1951 else {
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1952 src = texturedata->modulated_picture;
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1953 }
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1954
4614 a17de6a8f796 Code cleanup. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4613 diff changeset	1955 if(texture->blendMode == SDL_BLENDMODE_NONE)
a17de6a8f796 Code cleanup. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4613 diff changeset	1956 {
4606 4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	1957 mask = None;
4607 9e9ec5e3be95 Get SDL_BLENDMODE_MOD to work! Tested on nvidia only ATM. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4606 diff changeset	1958 mrect = srcrect;
4606 4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	1959 }
4614 a17de6a8f796 Code cleanup. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4613 diff changeset	1960 else if (texture->blendMode == SDL_BLENDMODE_MOD)
a17de6a8f796 Code cleanup. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4613 diff changeset	1961 {
4630 02895e9c796b Added some comments. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4629 diff changeset	1962 /* SDL_BLENDMODE_MOD requires a temporary buffer
02895e9c796b Added some comments. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4629 diff changeset	1963 * i.e. stencil_pict */
4607 9e9ec5e3be95 Get SDL_BLENDMODE_MOD to work! Tested on nvidia only ATM. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4606 diff changeset	1964 mask = data->stencil_pict;
4614 a17de6a8f796 Code cleanup. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4613 diff changeset	1965 mrect = dstrect;
4607 9e9ec5e3be95 Get SDL_BLENDMODE_MOD to work! Tested on nvidia only ATM. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4606 diff changeset	1966 }
4614 a17de6a8f796 Code cleanup. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4613 diff changeset	1967 else
a17de6a8f796 Code cleanup. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4613 diff changeset	1968 {
4630 02895e9c796b Added some comments. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4629 diff changeset	1969 /* This trick allows on-the-fly multiplication
02895e9c796b Added some comments. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4629 diff changeset	1970 * of the src color channels with it's alpha
02895e9c796b Added some comments. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4629 diff changeset	1971 * channel. */
4629 44fd1f0b895a Fixed a huge bug with texture scaling. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4624 diff changeset	1972 mask = src;
4607 9e9ec5e3be95 Get SDL_BLENDMODE_MOD to work! Tested on nvidia only ATM. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4606 diff changeset	1973 mrect = srcrect;
4606 4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	1974 }
4616 05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1975
4586 e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	1976 if(srcrect->w == dstrect->w && srcrect->h == dstrect->h) {
4607 9e9ec5e3be95 Get SDL_BLENDMODE_MOD to work! Tested on nvidia only ATM. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4606 diff changeset	1977 if (texture->blendMode == SDL_BLENDMODE_MOD) {
9e9ec5e3be95 Get SDL_BLENDMODE_MOD to work! Tested on nvidia only ATM. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4606 diff changeset	1978 XRenderComposite(data->display, PictOpSrc, data->drawable_pict,
4616 05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1979 src, data->stencil_pict,
4607 9e9ec5e3be95 Get SDL_BLENDMODE_MOD to work! Tested on nvidia only ATM. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4606 diff changeset	1980 dstrect->x, dstrect->y, srcrect->x, srcrect->y,
9e9ec5e3be95 Get SDL_BLENDMODE_MOD to work! Tested on nvidia only ATM. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4606 diff changeset	1981 dstrect->x, dstrect->y, dstrect->w, dstrect->h);
4606 4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	1982 attr.component_alpha = True;
4607 9e9ec5e3be95 Get SDL_BLENDMODE_MOD to work! Tested on nvidia only ATM. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4606 diff changeset	1983 XRenderChangePicture(data->display, data->stencil_pict,
4606 4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	1984 CPComponentAlpha, &attr);
4607 9e9ec5e3be95 Get SDL_BLENDMODE_MOD to work! Tested on nvidia only ATM. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4606 diff changeset	1985 }
4616 05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1986 XRenderComposite(data->display, texturedata->blend_op,
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1987 src, mask, data->drawable_pict, srcrect->x, srcrect->y,
4607 9e9ec5e3be95 Get SDL_BLENDMODE_MOD to work! Tested on nvidia only ATM. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4606 diff changeset	1988 mrect->x, mrect->y, dstrect->x, dstrect->y,
9e9ec5e3be95 Get SDL_BLENDMODE_MOD to work! Tested on nvidia only ATM. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4606 diff changeset	1989 dstrect->w, dstrect->h);
2828 7e5ff6cd05bf Added very slow software scaling to the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 2827 diff changeset	1990 } else {
4630 02895e9c796b Added some comments. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4629 diff changeset	1991 /* The transformation is from the dst to src picture. */
4629 44fd1f0b895a Fixed a huge bug with texture scaling. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4624 diff changeset	1992 double xscale = ((double) srcrect->w) / dstrect->w;
44fd1f0b895a Fixed a huge bug with texture scaling. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4624 diff changeset	1993 double yscale = ((double) srcrect->h) / dstrect->h;
4593 3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	1994 XTransform xform = {{
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	1995 {XDoubleToFixed(xscale), XDoubleToFixed(0), XDoubleToFixed(0)},
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	1996 {XDoubleToFixed(0), XDoubleToFixed(yscale), XDoubleToFixed(0)},
4632 066ce836b80e Fixed the code to use the correct scaling transformation matrix with XRender. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4630 diff changeset	1997 {XDoubleToFixed(0), XDoubleToFixed(0), XDoubleToFixed(1)}}};
4616 05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	1998 XRenderSetPictureTransform(data->display, src, &xform);
4606 4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	1999
4630 02895e9c796b Added some comments. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4629 diff changeset	2000 /* Black magic follows. */
4607 9e9ec5e3be95 Get SDL_BLENDMODE_MOD to work! Tested on nvidia only ATM. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4606 diff changeset	2001 if (texture->blendMode == SDL_BLENDMODE_MOD) {
4630 02895e9c796b Added some comments. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4629 diff changeset	2002 /* Copy the dst to a temp buffer. */
4607 9e9ec5e3be95 Get SDL_BLENDMODE_MOD to work! Tested on nvidia only ATM. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4606 diff changeset	2003 XRenderComposite(data->display, PictOpSrc, data->drawable_pict,
4616 05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	2004 src, data->stencil_pict,
4607 9e9ec5e3be95 Get SDL_BLENDMODE_MOD to work! Tested on nvidia only ATM. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4606 diff changeset	2005 dstrect->x, dstrect->y, srcrect->x, srcrect->y,
9e9ec5e3be95 Get SDL_BLENDMODE_MOD to work! Tested on nvidia only ATM. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4606 diff changeset	2006 dstrect->x, dstrect->y, dstrect->w, dstrect->h);
4630 02895e9c796b Added some comments. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4629 diff changeset	2007 /* Set the compnent alpha flag on the temp buffer. */
4606 4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	2008 attr.component_alpha = True;
4607 9e9ec5e3be95 Get SDL_BLENDMODE_MOD to work! Tested on nvidia only ATM. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4606 diff changeset	2009 XRenderChangePicture(data->display, data->stencil_pict,
4606 4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	2010 CPComponentAlpha, &attr);
4607 9e9ec5e3be95 Get SDL_BLENDMODE_MOD to work! Tested on nvidia only ATM. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4606 diff changeset	2011 }
4606 4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	2012
4630 02895e9c796b Added some comments. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4629 diff changeset	2013 /* Set the picture filter only if a scaling mode is set. */
4929 aa8888658021 Use the enumerated type for blend and scale mode instead of int Sam Lantinga <slouken@libsdl.org> parents: 4898 diff changeset	2014 if (texture->scaleMode != SDL_SCALEMODE_NONE) {
4629 44fd1f0b895a Fixed a huge bug with texture scaling. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4624 diff changeset	2015 XRenderSetPictureFilter(data->display, src,
44fd1f0b895a Fixed a huge bug with texture scaling. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4624 diff changeset	2016 texturedata->filter, 0, 0);
44fd1f0b895a Fixed a huge bug with texture scaling. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4624 diff changeset	2017 }
4593 3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	2018
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	2019 XRenderComposite(data->display, texturedata->blend_op,
4616 05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	2020 src, mask, data->drawable_pict,
4607 9e9ec5e3be95 Get SDL_BLENDMODE_MOD to work! Tested on nvidia only ATM. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4606 diff changeset	2021 srcrect->x, srcrect->y, mrect->x, mrect->y,
4606 4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	2022 dstrect->x, dstrect->y, dstrect->w, dstrect->h);
4630 02895e9c796b Added some comments. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4629 diff changeset	2023 /* Set the texture transformation back to the identity matrix. */
4593 3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	2024 XTransform identity = {{
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	2025 {XDoubleToFixed(1), XDoubleToFixed(0), XDoubleToFixed(0)},
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	2026 {XDoubleToFixed(0), XDoubleToFixed(1), XDoubleToFixed(0)},
3892fe2f6537 Fixed so many things. See the changelog listed below. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4591 diff changeset	2027 {XDoubleToFixed(0), XDoubleToFixed(0), XDoubleToFixed(1)}}};
4616 05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	2028 XRenderSetPictureTransform(data->display, src, &identity);
2828 7e5ff6cd05bf Added very slow software scaling to the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 2827 diff changeset	2029 }
4630 02895e9c796b Added some comments. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4629 diff changeset	2030
02895e9c796b Added some comments. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4629 diff changeset	2031 /* Reset the component alpha flag only when
02895e9c796b Added some comments. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4629 diff changeset	2032 * the blending mode is SDL_BLENDMODE_MOD. */
4607 9e9ec5e3be95 Get SDL_BLENDMODE_MOD to work! Tested on nvidia only ATM. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4606 diff changeset	2033 if (renderer->blendMode == SDL_BLENDMODE_MOD) {
4606 4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	2034 attr.component_alpha = False;
4607 9e9ec5e3be95 Get SDL_BLENDMODE_MOD to work! Tested on nvidia only ATM. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4606 diff changeset	2035 XRenderChangePicture(data->display, data->stencil_pict,
4606 4e145485971b Implement support for setting texture scale mode. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4605 diff changeset	2036 CPComponentAlpha, &attr);
4607 9e9ec5e3be95 Get SDL_BLENDMODE_MOD to work! Tested on nvidia only ATM. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4606 diff changeset	2037 }
4586 e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2038 }
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2039 else
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2040 #endif
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2041 {
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2042 if (srcrect->w == dstrect->w && srcrect->h == dstrect->h) {
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2043 #ifndef NO_SHARED_MEMORY
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2044 if (texturedata->shminfo.shmaddr) {
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2045 XShmPutImage(data->display, data->drawable, data->gc,
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2046 texturedata->image, srcrect->x, srcrect->y,
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2047 dstrect->x, dstrect->y, srcrect->w, srcrect->h,
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2048 False);
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2049 } else
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2050 #endif
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2051 if (texturedata->pixels) {
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2052 XPutImage(data->display, data->drawable, data->gc,
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2053 texturedata->image, srcrect->x, srcrect->y, dstrect->x,
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2054 dstrect->y, srcrect->w, srcrect->h);
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2055 } else {
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2056 XCopyArea(data->display, texturedata->pixmap, data->drawable,
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2057 data->gc, srcrect->x, srcrect->y, dstrect->w,
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2058 dstrect->h, dstrect->x, dstrect->y);
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2059 }
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2060 } else if (texturedata->yuv
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2061 \|\| texture->access == SDL_TEXTUREACCESS_STREAMING) {
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2062 SDL_Surface src, dst;
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2063 SDL_PixelFormat fmt;
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2064 SDL_Rect rect;
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2065 XImage *image = texturedata->scaling_image;
2828 7e5ff6cd05bf Added very slow software scaling to the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 2827 diff changeset	2066
4586 e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2067 if (!image) {
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2068 void *pixels;
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2069 int pitch;
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2070
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2071 pitch = dstrect->w * SDL_BYTESPERPIXEL(texturedata->format);
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2072 pixels = SDL_malloc(dstrect->h * pitch);
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2073 if (!pixels) {
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2074 SDL_OutOfMemory();
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2075 return -1;
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2076 }
2828 7e5ff6cd05bf Added very slow software scaling to the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 2827 diff changeset	2077
4586 e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2078 image =
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2079 XCreateImage(data->display, data->visual, data->depth,
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2080 ZPixmap, 0, pixels, dstrect->w, dstrect->h,
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2081 SDL_BYTESPERPIXEL(texturedata->format) * 8,
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2082 pitch);
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2083 if (!image) {
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2084 SDL_SetError("XCreateImage() failed");
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2085 return -1;
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2086 }
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2087 texturedata->scaling_image = image;
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2088
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2089 } else if (image->width != dstrect->w \|\| image->height != dstrect->h
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2090 \|\| !image->data) {
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2091 image->width = dstrect->w;
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2092 image->height = dstrect->h;
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2093 image->bytes_per_line =
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2094 image->width * SDL_BYTESPERPIXEL(texturedata->format);
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2095 image->data =
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2096 (char *) SDL_realloc(image->data,
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2097 image->height * image->bytes_per_line);
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2098 if (!image->data) {
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2099 SDL_OutOfMemory();
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2100 return -1;
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2101 }
2828 7e5ff6cd05bf Added very slow software scaling to the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 2827 diff changeset	2102 }
7e5ff6cd05bf Added very slow software scaling to the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 2827 diff changeset	2103
4586 e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2104 /* Set up fake surfaces for SDL_SoftStretch() */
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2105 SDL_zero(src);
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2106 src.format = &fmt;
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2107 src.w = texture->w;
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2108 src.h = texture->h;
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2109 #ifndef NO_SHARED_MEMORY
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2110 if (texturedata->shminfo.shmaddr) {
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2111 src.pixels = texturedata->shminfo.shmaddr;
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2112 } else
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2113 #endif
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2114 src.pixels = texturedata->pixels;
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2115 src.pitch = texturedata->pitch;
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2116
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2117 SDL_zero(dst);
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2118 dst.format = &fmt;
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2119 dst.w = image->width;
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2120 dst.h = image->height;
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2121 dst.pixels = image->data;
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2122 dst.pitch = image->bytes_per_line;
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2123
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2124 fmt.BytesPerPixel = SDL_BYTESPERPIXEL(texturedata->format);
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2125
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2126 rect.x = 0;
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2127 rect.y = 0;
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2128 rect.w = dstrect->w;
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2129 rect.h = dstrect->h;
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2130 if (SDL_SoftStretch(&src, srcrect, &dst, &rect) < 0) {
2828 7e5ff6cd05bf Added very slow software scaling to the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 2827 diff changeset	2131 return -1;
7e5ff6cd05bf Added very slow software scaling to the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 2827 diff changeset	2132 }
4586 e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2133 XPutImage(data->display, data->drawable, data->gc, image, 0, 0,
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2134 dstrect->x, dstrect->y, dstrect->w, dstrect->h);
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2135 } else {
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2136 XCopyArea(data->display, texturedata->pixmap, data->drawable,
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2137 data->gc, srcrect->x, srcrect->y, dstrect->w, dstrect->h,
e479c1e57c52 SDL_Textures should work with XRender now provided that the texture format and screen format match. This is only a temporary limitation. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4585 diff changeset	2138 srcrect->x, srcrect->y);
2828 7e5ff6cd05bf Added very slow software scaling to the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 2827 diff changeset	2139 }
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2140 }
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2141 return 0;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2142 }
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2143
3559 5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2144 static int
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2145 X11_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect,
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2146 Uint32 format, void * pixels, int pitch)
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2147 {
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2148 X11_RenderData data = (X11_RenderData ) renderer->driverdata;
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3596 diff changeset	2149 SDL_Window *window = renderer->window;
64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3596 diff changeset	2150 SDL_VideoDisplay *display = window->display;
3559 5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2151 Uint32 screen_format = display->current_mode.format;
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2152 XImage *image;
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2153
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2154 image = XGetImage(data->display, data->drawable, rect->x, rect->y,
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2155 rect->w, rect->h, AllPlanes, ZPixmap);
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2156
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2157 SDL_ConvertPixels(rect->w, rect->h,
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2158 screen_format, image->data, image->bytes_per_line,
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2159 format, pixels, pitch);
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2160
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2161 XDestroyImage(image);
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2162 return 0;
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2163 }
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2164
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2165 static int
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2166 X11_RenderWritePixels(SDL_Renderer * renderer, const SDL_Rect * rect,
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2167 Uint32 format, const void * pixels, int pitch)
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2168 {
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2169 X11_RenderData data = (X11_RenderData ) renderer->driverdata;
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3596 diff changeset	2170 SDL_Window *window = renderer->window;
64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3596 diff changeset	2171 SDL_VideoDisplay *display = window->display;
3559 5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2172 Uint32 screen_format = display->current_mode.format;
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2173 XImage *image;
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2174 void *image_pixels;
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2175 int image_pitch;
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2176
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2177 image_pitch = rect->w * SDL_BYTESPERPIXEL(screen_format);
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2178 image_pixels = SDL_malloc(rect->h * image_pitch);
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2179 if (!image_pixels) {
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2180 SDL_OutOfMemory();
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2181 return -1;
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2182 }
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2183
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2184 image = XCreateImage(data->display, data->visual,
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2185 data->depth, ZPixmap, 0, image_pixels,
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2186 rect->w, rect->h,
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2187 SDL_BYTESPERPIXEL(screen_format) * 8,
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2188 image_pitch);
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2189 if (!image) {
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2190 SDL_SetError("XCreateImage() failed");
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2191 return -1;
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2192 }
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2193
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2194 SDL_ConvertPixels(rect->w, rect->h,
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2195 format, pixels, pitch,
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2196 screen_format, image->data, image->bytes_per_line);
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2197
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2198 XPutImage(data->display, data->drawable, data->gc,
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2199 image, 0, 0, rect->x, rect->y, rect->w, rect->h);
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2200
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2201 image->data = NULL;
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2202 XDestroyImage(image);
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2203
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2204 SDL_free(image_pixels);
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2205 return 0;
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2206 }
5f26a7eb5ff0 Implemented read/write pixels for the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 3543 diff changeset	2207
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2208 static void
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2209 X11_RenderPresent(SDL_Renderer * renderer)
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2210 {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2211 X11_RenderData data = (X11_RenderData ) renderer->driverdata;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2212 SDL_DirtyRect *dirty;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2213
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2214 /* Send the data to the display */
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2215 if (!(renderer->info.flags & SDL_RENDERER_SINGLEBUFFER)) {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2216 for (dirty = data->dirty.list; dirty; dirty = dirty->next) {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2217 const SDL_Rect *rect = &dirty->rect;
4579 d490d63bcc5e X11_RenderPresent now uses XRender to blit back-buffers to the screen. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4578 diff changeset	2218 #ifdef SDL_VIDEO_DRIVER_X11_XRENDER
4598 66e13a224bd6 Major changes to drawing. Reverted back to core X11 functions due to regressions. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4597 diff changeset	2219 if (data->use_xrender)
4579 d490d63bcc5e X11_RenderPresent now uses XRender to blit back-buffers to the screen. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4578 diff changeset	2220 {
4591 1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	2221 XRenderComposite(data->display,
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	2222 data->blend_op,
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	2223 data->drawable_pict,
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	2224 None,
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	2225 data->xwindow_pict,
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	2226 rect->x, rect->y,
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	2227 0, 0,
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	2228 rect->x, rect->y,
1e998db9b597 Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4590 diff changeset	2229 rect->w, rect->h);
4579 d490d63bcc5e X11_RenderPresent now uses XRender to blit back-buffers to the screen. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4578 diff changeset	2230 }
d490d63bcc5e X11_RenderPresent now uses XRender to blit back-buffers to the screen. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4578 diff changeset	2231 else
d490d63bcc5e X11_RenderPresent now uses XRender to blit back-buffers to the screen. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4578 diff changeset	2232 #endif
d490d63bcc5e X11_RenderPresent now uses XRender to blit back-buffers to the screen. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4578 diff changeset	2233 {
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3596 diff changeset	2234 XCopyArea(data->display, data->drawable, data->xwindow,
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2235 data->gc, rect->x, rect->y, rect->w, rect->h,
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2236 rect->x, rect->y);
4579 d490d63bcc5e X11_RenderPresent now uses XRender to blit back-buffers to the screen. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4578 diff changeset	2237 }
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2238 }
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2239 SDL_ClearDirtyRects(&data->dirty);
4598 66e13a224bd6 Major changes to drawing. Reverted back to core X11 functions due to regressions. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4597 diff changeset	2240 }
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2241 XSync(data->display, False);
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2242
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2243 /* Update the flipping chain, if any */
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2244 if (renderer->info.flags & SDL_RENDERER_PRESENTFLIP2) {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2245 data->current_pixmap = (data->current_pixmap + 1) % 2;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2246 data->drawable = data->pixmaps[data->current_pixmap];
4579 d490d63bcc5e X11_RenderPresent now uses XRender to blit back-buffers to the screen. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4578 diff changeset	2247 #ifdef SDL_VIDEO_DRIVER_X11_XRENDER
d490d63bcc5e X11_RenderPresent now uses XRender to blit back-buffers to the screen. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4578 diff changeset	2248 data->drawable_pict = data->pixmap_picts[data->current_pixmap];
d490d63bcc5e X11_RenderPresent now uses XRender to blit back-buffers to the screen. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4578 diff changeset	2249 #endif
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2250 } else if (renderer->info.flags & SDL_RENDERER_PRESENTFLIP3) {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2251 data->current_pixmap = (data->current_pixmap + 1) % 3;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2252 data->drawable = data->pixmaps[data->current_pixmap];
4579 d490d63bcc5e X11_RenderPresent now uses XRender to blit back-buffers to the screen. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4578 diff changeset	2253 #ifdef SDL_VIDEO_DRIVER_X11_XRENDER
d490d63bcc5e X11_RenderPresent now uses XRender to blit back-buffers to the screen. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4578 diff changeset	2254 data->drawable_pict = data->pixmap_picts[data->current_pixmap];
d490d63bcc5e X11_RenderPresent now uses XRender to blit back-buffers to the screen. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4578 diff changeset	2255 #endif
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2256 }
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2257 }
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2258
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2259 static void
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2260 X11_DestroyTexture(SDL_Renderer * renderer, SDL_Texture * texture)
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2261 {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2262 X11_RenderData renderdata = (X11_RenderData ) renderer->driverdata;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2263 X11_TextureData data = (X11_TextureData ) texture->driverdata;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2264
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2265 if (!data) {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2266 return;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2267 }
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2268 if (data->yuv) {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2269 SDL_SW_DestroyYUVTexture(data->yuv);
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2270 }
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2271 if (data->pixmap != None) {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2272 XFreePixmap(renderdata->display, data->pixmap);
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2273 }
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2274 if (data->image) {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2275 data->image->data = NULL;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2276 XDestroyImage(data->image);
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2277 }
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2278 #ifndef NO_SHARED_MEMORY
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2279 if (data->shminfo.shmaddr) {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2280 XShmDetach(renderdata->display, &data->shminfo);
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2281 XSync(renderdata->display, False);
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2282 shmdt(data->shminfo.shmaddr);
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2283 data->pixels = NULL;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2284 }
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2285 #endif
4609 630002c8be85 Fix cleanup functions. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4608 diff changeset	2286 #ifdef SDL_VIDEO_DRIVER_X11_XRENDER
630002c8be85 Fix cleanup functions. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4608 diff changeset	2287 if (renderdata->use_xrender) {
630002c8be85 Fix cleanup functions. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4608 diff changeset	2288 if (data->picture) {
630002c8be85 Fix cleanup functions. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4608 diff changeset	2289 XRenderFreePicture(renderdata->display, data->picture);
630002c8be85 Fix cleanup functions. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4608 diff changeset	2290 }
4616 05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	2291 if (data->modulated_pixmap) {
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	2292 XFreePixmap(renderdata->display, data->modulated_pixmap);
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	2293 }
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	2294 if (data->modulated_picture) {
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	2295 XRenderFreePicture(renderdata->display, data->modulated_picture);
05eb4a07e5e3 Add support for texture modulation (both color and alpha). testsprite2 works now with --cyclealpha and --cyclecolor. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4615 diff changeset	2296 }
4609 630002c8be85 Fix cleanup functions. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4608 diff changeset	2297 }
630002c8be85 Fix cleanup functions. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4608 diff changeset	2298 #endif
2828 7e5ff6cd05bf Added very slow software scaling to the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 2827 diff changeset	2299 if (data->scaling_image) {
7e5ff6cd05bf Added very slow software scaling to the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 2827 diff changeset	2300 SDL_free(data->scaling_image->data);
7e5ff6cd05bf Added very slow software scaling to the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 2827 diff changeset	2301 data->scaling_image->data = NULL;
7e5ff6cd05bf Added very slow software scaling to the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 2827 diff changeset	2302 XDestroyImage(data->scaling_image);
7e5ff6cd05bf Added very slow software scaling to the X11 renderer Sam Lantinga <slouken@libsdl.org> parents: 2827 diff changeset	2303 }
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2304 if (data->pixels) {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2305 SDL_free(data->pixels);
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2306 }
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2307 SDL_free(data);
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2308 texture->driverdata = NULL;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2309 }
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2310
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2311 static void
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2312 X11_DestroyRenderer(SDL_Renderer * renderer)
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2313 {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2314 X11_RenderData data = (X11_RenderData ) renderer->driverdata;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2315 int i;
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2316
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2317 if (data) {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2318 for (i = 0; i < SDL_arraysize(data->pixmaps); ++i) {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2319 if (data->pixmaps[i] != None) {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2320 XFreePixmap(data->display, data->pixmaps[i]);
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2321 }
4584 9907c8cc6015 X11_RenderFillRects and X11_RenderDrawRects use a server side mask pixmap of 1 bit depth now. All drawing on these pixmaps is done by server side functions such as XDrawRectangles and XFillRectangles. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4583 diff changeset	2322 #ifdef SDL_VIDEO_DRIVER_X11_XRENDER
4609 630002c8be85 Fix cleanup functions. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4608 diff changeset	2323 if (data->use_xrender && data->pixmap_picts[i]) {
4584 9907c8cc6015 X11_RenderFillRects and X11_RenderDrawRects use a server side mask pixmap of 1 bit depth now. All drawing on these pixmaps is done by server side functions such as XDrawRectangles and XFillRectangles. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4583 diff changeset	2324 XRenderFreePicture(data->display, data->pixmap_picts[i]);
9907c8cc6015 X11_RenderFillRects and X11_RenderDrawRects use a server side mask pixmap of 1 bit depth now. All drawing on these pixmaps is done by server side functions such as XDrawRectangles and XFillRectangles. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4583 diff changeset	2325 }
9907c8cc6015 X11_RenderFillRects and X11_RenderDrawRects use a server side mask pixmap of 1 bit depth now. All drawing on these pixmaps is done by server side functions such as XDrawRectangles and XFillRectangles. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4583 diff changeset	2326 #endif
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2327 }
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2328 if (data->gc) {
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2329 XFreeGC(data->display, data->gc);
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2330 }
4584 9907c8cc6015 X11_RenderFillRects and X11_RenderDrawRects use a server side mask pixmap of 1 bit depth now. All drawing on these pixmaps is done by server side functions such as XDrawRectangles and XFillRectangles. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4583 diff changeset	2331 #ifdef SDL_VIDEO_DRIVER_X11_XRENDER
4609 630002c8be85 Fix cleanup functions. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4608 diff changeset	2332 if (data->use_xrender) {
630002c8be85 Fix cleanup functions. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4608 diff changeset	2333 if (data->stencil_gc) {
630002c8be85 Fix cleanup functions. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4608 diff changeset	2334 XFreeGC(data->display, data->stencil_gc);
630002c8be85 Fix cleanup functions. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4608 diff changeset	2335 }
630002c8be85 Fix cleanup functions. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4608 diff changeset	2336 if (data->stencil) {
630002c8be85 Fix cleanup functions. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4608 diff changeset	2337 XFreePixmap(data->display, data->stencil);
630002c8be85 Fix cleanup functions. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4608 diff changeset	2338 }
630002c8be85 Fix cleanup functions. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4608 diff changeset	2339 if (data->stencil_pict) {
630002c8be85 Fix cleanup functions. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4608 diff changeset	2340 XRenderFreePicture(data->display, data->stencil_pict);
630002c8be85 Fix cleanup functions. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4608 diff changeset	2341 }
630002c8be85 Fix cleanup functions. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4608 diff changeset	2342 if (data->xwindow_pict) {
630002c8be85 Fix cleanup functions. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4608 diff changeset	2343 XRenderFreePicture(data->display, data->xwindow_pict);
630002c8be85 Fix cleanup functions. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4608 diff changeset	2344 }
630002c8be85 Fix cleanup functions. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4608 diff changeset	2345 #ifdef SDL_VIDEO_DRIVER_X11_XDAMAGE
630002c8be85 Fix cleanup functions. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4608 diff changeset	2346 if (data->use_xdamage && data->stencil_damage) {
630002c8be85 Fix cleanup functions. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4608 diff changeset	2347 XDamageDestroy(data->display, data->stencil_damage);
630002c8be85 Fix cleanup functions. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4608 diff changeset	2348 }
630002c8be85 Fix cleanup functions. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4608 diff changeset	2349 #endif
4584 9907c8cc6015 X11_RenderFillRects and X11_RenderDrawRects use a server side mask pixmap of 1 bit depth now. All drawing on these pixmaps is done by server side functions such as XDrawRectangles and XFillRectangles. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4583 diff changeset	2350 }
9907c8cc6015 X11_RenderFillRects and X11_RenderDrawRects use a server side mask pixmap of 1 bit depth now. All drawing on these pixmaps is done by server side functions such as XDrawRectangles and XFillRectangles. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 4583 diff changeset	2351 #endif
2810 27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2352 SDL_FreeDirtyRects(&data->dirty);
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2353 SDL_free(data);
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2354 }
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2355 SDL_free(renderer);
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2356 }
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2357
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2358 #endif /* SDL_VIDEO_RENDER_X11 */
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2359
27cb878a278e Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2360 /* vi: set ts=4 sw=4 expandtab: */

Mercurial > sdl-ios-xcode

annotate src/video/x11/SDL_x11render.c @ 5134:7b7da52e8775