sdl-ios-xcode: src/video/x11/SDL_x11render.c comparison

comparison src/video/x11/SDL_x11render.c @ 4633:100f7ab48946

Documentation and code safety updates. (x11 renderer)

author	Sunny Sachanandani <sunnysachanandani@gmail.com>
date	Sun, 08 Aug 2010 19:26:30 +0530
parents	066ce836b80e
children	164bee619400

comparison

equal deleted inserted replaced

-:066ce836b80e
+:100f7ab48946
 XRenderPictFormat templ;
 templ.type = PictTypeDirect;
 XRenderPictFormat *pict_format;
 Uint32 format;
 int i = 0;
+/* Convert each XRenderPictFormat into appropriate
+* SDLPixelFormatEnum. */
 while (info->num_texture_formats < 50) {
 pict_format =
 XRenderFindFormat(data->display, PictFormatType, &templ, i++);
 if (pict_format) {
 format = XRenderPictFormatToSDLPixelFormatEnum(pict_format);
 }
 }
 else
 break;
 }
+/* Update the capabilities of the renderer. */
 info->blend_modes |= (SDL_BLENDMODE_BLEND | SDL_BLENDMODE_ADD |
 SDL_BLENDMODE_MOD | SDL_BLENDMODE_MASK);
 info->scale_modes |= (SDL_TEXTURESCALEMODE_FAST | SDL_TEXTURESCALEMODE_SLOW |
 SDL_TEXTURESCALEMODE_BEST);
 info->mod_modes |= (SDL_TEXTUREMODULATE_COLOR | SDL_TEXTUREMODULATE_ALPHA);
 0, 0,
 window->w, window->h);
 /* Create a clip mask that is used for rendering primitives. */
 data->stencil = XCreatePixmap(data->display, data->xwindow,
 window->w, window->h, 32);
+if (!data->stencil) {
+SDL_SetError("XCreatePixmap() failed.");
+return NULL;
+}
 /* Create the GC for the clip mask. */
 data->stencil_gc = XCreateGC(data->display, data->stencil,
 GCGraphicsExposures, &gcv);
+/* Set the GC parameters. */
 XSetBackground(data->display, data->stencil_gc, 0);
 XSetForeground(data->display, data->stencil_gc, 0);
 XFillRectangle(data->display, data->stencil, data->stencil_gc,
 0, 0, window->w, window->h);
 XSetForeground(data->display, data->stencil_gc, 0xFFFFFFFF);
+/* Create an XRender Picture for the clip mask. */
 data->stencil_pict =
 XRenderCreatePicture(data->display, data->stencil,
 XRenderFindStandardFormat(data->display,
 PictStandardARGB32),
 0, NULL);
+if (!data->stencil_pict) {
+SDL_SetError("XRenderCreatePicture() failed.");
+return NULL;
+}
 #ifdef SDL_VIDEO_DRIVER_X11_XDAMAGE
 if (data->use_xdamage) {
 data->stencil_damage =
 XDamageCreate(data->display, data->stencil, XDamageReportNonEmpty);
+if (!data->stencil_damage) {
+SDL_SetError("XDamageCreate() failed.");
+return NULL;
+}
 XDamageSubtract(data->display, data->stencil_damage, None, data->stencil_parts);
 }
 #endif
+/* Create a brush pixmap for the color being
+* drawn at any given time. */
 data->brush =
 XCreatePixmap(data->display, data->xwindow, 1, 1, 32);
+if (!data->brush) {
+SDL_SetError("XCreatePixmap() failed.");
+return NULL;
+}
+/* Set some parameters for the brush. */
 XRenderPictureAttributes brush_attr;
 brush_attr.repeat = RepeatNormal;
+/* Create an XRender Picture for the brush
+* with the above parameters. */
 data->brush_pict =
 XRenderCreatePicture(data->display, data->brush,
 XRenderFindStandardFormat(data->display,
 PictStandardARGB32),
 CPRepeat, &brush_attr);
-// Set the default blending mode.
+if (!data->brush_pict) {
+SDL_SetError("XRenderCreatePicture() failed.");
+return NULL;
+}
+// FIXME: Is the following necessary?
+/* Set the default blending mode. */
 renderer->blendMode = SDL_BLENDMODE_BLEND;
 data->blend_op = PictOpOver;
 }
 #endif
 if (flags & SDL_RENDERER_SINGLEBUFFER) {
 {
 data->pixmaps[i] =
 XCreatePixmap(data->display, data->xwindow, window->w, window->h,
 displaydata->depth);
 }
-if (data->pixmaps[i] == None) {
+if (!data->pixmaps[i]) {
 X11_DestroyRenderer(renderer);
 SDL_SetError("XCreatePixmap() failed");
 return NULL;
 }
 #ifdef SDL_VIDEO_DRIVER_X11_XRENDER
 if (data->use_xrender) {
-/* Create xrender pictures for each of the pixmaps
+/* Create XRender pictures for each of the pixmaps
 * and clear the pixmaps. */
 data->pixmap_picts[i] =
 XRenderCreatePicture(data->display,
 data->pixmaps[i],
 XRenderFindStandardFormat(data->display,
 data->makedirty = SDL_FALSE;
 }
 data->current_pixmap = 0;
 #ifdef SDL_VIDEO_DRIVER_X11_XRENDER
+/* When using XRender the drawable format
+* is not the same as the screen format. */
 if (data->use_xrender) {
 bpp = data->drawable_pict_fmt->depth;
 Rmask = ((data->drawable_pict_fmt->direct.redMask)
 << (data->drawable_pict_fmt->direct.red));
 Gmask = ((data->drawable_pict_fmt->direct.greenMask)
 if (data->use_xrender) {
 XRenderFreePicture(data->display, data->xwindow_pict);
 data->xwindow_pict_fmt =
 XRenderFindVisualFormat(data->display, data->visual);
+if (!data->xwindow_pict_fmt) {
+SDL_SetError("XRenderFindVisualFormat() failed.");
+return -1;
+}
 data->xwindow_pict =
 XRenderCreatePicture(data->display, data->xwindow,
 data->xwindow_pict_fmt, 0, NULL);
+if (!data->xwindow_pict) {
+SDL_SetError("XRenderCreatePicture() failed.");
+return -1;
+}
 XRenderComposite(data->display,
 PictOpClear,
 data->xwindow_pict,
 None,
 data->xwindow_pict,
 0, 0,
 0, 0,
 window->w, window->h);
 XFreePixmap(data->display, data->stencil);
-/* Create a clip mask that is used for rendering primitives. */
 data->stencil = XCreatePixmap(data->display, data->xwindow,
 window->w, window->h, 32);
+if (!data->stencil) {
+SDL_SetError("XCreatePixmap() failed.");
+return -1;
+}
 XRenderFreePicture(data->display, data->stencil_pict);
 data->stencil_pict =
 XRenderCreatePicture(data->display, data->stencil,
 XRenderFindStandardFormat(data->display,
 PictStandardARGB32),
 0, NULL);
+if (!data->stencil_pict) {
+SDL_SetError("XRenderCreatePicture() failed.");
+return -1;
+}
 #ifdef SDL_VIDEO_DRIVER_X11_XDAMAGE
 XDamageDestroy(data->display, data->stencil_damage);
 if (data->use_xdamage) {
 data->stencil_damage =
 XDamageCreate(data->display, data->stencil, XDamageReportNonEmpty);
+if (!data->stencil_damage) {
+SDL_SetError("XDamageCreate() failed.");
+return -1;
+}
 XDamageSubtract(data->display, data->stencil_damage, None, data->stencil_parts);
 }
 #endif
 }
 #endif
 if (!data->modulated_picture) {
 X11_DestroyTexture(renderer, texture);
 SDL_SetError("XRenderCreatePicture() failed");
 return -1;
 }
+// FIXME: Is the following required?
+/* Set the default blending and scaling modes. */
 texture->blendMode = SDL_BLENDMODE_NONE;
 texture->scaleMode = SDL_TEXTURESCALEMODE_NONE;
 data->blend_op = PictOpSrc;
 data->filter = NULL;
 }

Mercurial > sdl-ios-xcode

comparison src/video/x11/SDL_x11render.c @ 4633:100f7ab48946