include/SDL_video.h
changeset 3685 64ce267332c6
parent 3677 cec9ea711294
child 3691 9fed2aa469ed
     1.1 --- a/include/SDL_video.h	Thu Jan 21 05:49:41 2010 +0000
     1.2 +++ b/include/SDL_video.h	Thu Jan 21 06:21:52 2010 +0000
     1.3 @@ -88,7 +88,8 @@
     1.4   *  \sa SDL_SetWindowTitle()
     1.5   *  \sa SDL_ShowWindow()
     1.6   */
     1.7 -typedef Uint32 SDL_WindowID;
     1.8 +struct SDL_Window;
     1.9 +typedef struct SDL_Window SDL_Window;
    1.10  
    1.11  /**
    1.12   *  \brief The flags on a window
    1.13 @@ -248,7 +249,8 @@
    1.14  /**
    1.15   *  \brief An efficient driver-specific representation of pixel data
    1.16   */
    1.17 -typedef Uint32 SDL_TextureID;
    1.18 +struct SDL_Texture;
    1.19 +typedef struct SDL_Texture SDL_Texture;
    1.20  
    1.21  /**
    1.22   *  \brief An opaque handle to an OpenGL context.
    1.23 @@ -449,7 +451,7 @@
    1.24   *  \sa SDL_GetWindowDisplayMode()
    1.25   *  \sa SDL_SetWindowFullscreen()
    1.26   */
    1.27 -extern DECLSPEC int SDLCALL SDL_SetWindowDisplayMode(SDL_WindowID windowID,
    1.28 +extern DECLSPEC int SDLCALL SDL_SetWindowDisplayMode(SDL_Window * window,
    1.29                                                       const SDL_DisplayMode
    1.30                                                           * mode);
    1.31  
    1.32 @@ -460,7 +462,7 @@
    1.33   *  \sa SDL_SetWindowDisplayMode()
    1.34   *  \sa SDL_SetWindowFullscreen()
    1.35   */
    1.36 -extern DECLSPEC int SDLCALL SDL_GetWindowDisplayMode(SDL_WindowID windowID,
    1.37 +extern DECLSPEC int SDLCALL SDL_GetWindowDisplayMode(SDL_Window * window,
    1.38                                                       SDL_DisplayMode * mode);
    1.39  
    1.40  /**
    1.41 @@ -551,7 +553,7 @@
    1.42   *  
    1.43   *  \sa SDL_DestroyWindow()
    1.44   */
    1.45 -extern DECLSPEC SDL_WindowID SDLCALL SDL_CreateWindow(const char *title,
    1.46 +extern DECLSPEC SDL_Window * SDLCALL SDL_CreateWindow(const char *title,
    1.47                                                        int x, int y, int w,
    1.48                                                        int h, Uint32 flags);
    1.49  
    1.50 @@ -564,19 +566,29 @@
    1.51   *  
    1.52   *  \sa SDL_DestroyWindow()
    1.53   */
    1.54 -extern DECLSPEC SDL_WindowID SDLCALL SDL_CreateWindowFrom(const void *data);
    1.55 +extern DECLSPEC SDL_Window * SDLCALL SDL_CreateWindowFrom(const void *data);
    1.56 +
    1.57 +/**
    1.58 + *  \brief Get the numeric ID of the window, for logging purposes.
    1.59 + */
    1.60 +extern DECLSPEC Uint32 SDLCALL SDL_GetWindowID(SDL_Window * window);
    1.61 +
    1.62 +/**
    1.63 + *  \brief Get a window from a stored ID, or NULL if it doesn't exist.
    1.64 + */
    1.65 +extern DECLSPEC SDL_Window * SDLCALL SDL_GetWindowFromID(Uint32 id);
    1.66  
    1.67  /**
    1.68   *  \brief Get the window flags.
    1.69   */
    1.70 -extern DECLSPEC Uint32 SDLCALL SDL_GetWindowFlags(SDL_WindowID windowID);
    1.71 +extern DECLSPEC Uint32 SDLCALL SDL_GetWindowFlags(SDL_Window * window);
    1.72  
    1.73  /**
    1.74   *  \brief Set the title of the window, in UTF-8 format.
    1.75   *  
    1.76   *  \sa SDL_GetWindowTitle()
    1.77   */
    1.78 -extern DECLSPEC void SDLCALL SDL_SetWindowTitle(SDL_WindowID windowID,
    1.79 +extern DECLSPEC void SDLCALL SDL_SetWindowTitle(SDL_Window * window,
    1.80                                                  const char *title);
    1.81  
    1.82  /**
    1.83 @@ -584,14 +596,14 @@
    1.84   *  
    1.85   *  \sa SDL_SetWindowTitle()
    1.86   */
    1.87 -extern DECLSPEC const char *SDLCALL SDL_GetWindowTitle(SDL_WindowID windowID);
    1.88 +extern DECLSPEC const char *SDLCALL SDL_GetWindowTitle(SDL_Window * window);
    1.89  
    1.90  /**
    1.91   *  \brief Set the icon of the window.
    1.92   *  
    1.93   *  \param icon The icon for the window.
    1.94   */
    1.95 -extern DECLSPEC void SDLCALL SDL_SetWindowIcon(SDL_WindowID windowID,
    1.96 +extern DECLSPEC void SDLCALL SDL_SetWindowIcon(SDL_Window * window,
    1.97                                                 SDL_Surface * icon);
    1.98  
    1.99  /**
   1.100 @@ -599,7 +611,7 @@
   1.101   *  
   1.102   *  \sa SDL_GetWindowData()
   1.103   */
   1.104 -extern DECLSPEC void SDLCALL SDL_SetWindowData(SDL_WindowID windowID,
   1.105 +extern DECLSPEC void SDLCALL SDL_SetWindowData(SDL_Window * window,
   1.106                                                 void *userdata);
   1.107  
   1.108  /**
   1.109 @@ -607,12 +619,12 @@
   1.110   *  
   1.111   *  \sa SDL_SetWindowData()
   1.112   */
   1.113 -extern DECLSPEC void *SDLCALL SDL_GetWindowData(SDL_WindowID windowID);
   1.114 +extern DECLSPEC void *SDLCALL SDL_GetWindowData(SDL_Window * window);
   1.115  
   1.116  /**
   1.117   *  \brief Set the position of the window.
   1.118   *  
   1.119 - *  \param windowID The window to reposition.
   1.120 + *  \param window The window to reposition.
   1.121   *  \param x        The x coordinate of the window, ::SDL_WINDOWPOS_CENTERED, or
   1.122                      ::SDL_WINDOWPOS_UNDEFINED.
   1.123   *  \param y        The y coordinate of the window, ::SDL_WINDOWPOS_CENTERED, or
   1.124 @@ -622,7 +634,7 @@
   1.125   *  
   1.126   *  \sa SDL_GetWindowPosition()
   1.127   */
   1.128 -extern DECLSPEC void SDLCALL SDL_SetWindowPosition(SDL_WindowID windowID,
   1.129 +extern DECLSPEC void SDLCALL SDL_SetWindowPosition(SDL_Window * window,
   1.130                                                     int x, int y);
   1.131  
   1.132  /**
   1.133 @@ -630,7 +642,7 @@
   1.134   *  
   1.135   *  \sa SDL_SetWindowPosition()
   1.136   */
   1.137 -extern DECLSPEC void SDLCALL SDL_GetWindowPosition(SDL_WindowID windowID,
   1.138 +extern DECLSPEC void SDLCALL SDL_GetWindowPosition(SDL_Window * window,
   1.139                                                     int *x, int *y);
   1.140  
   1.141  /**
   1.142 @@ -641,7 +653,7 @@
   1.143   *  
   1.144   *  \sa SDL_GetWindowSize()
   1.145   */
   1.146 -extern DECLSPEC void SDLCALL SDL_SetWindowSize(SDL_WindowID windowID, int w,
   1.147 +extern DECLSPEC void SDLCALL SDL_SetWindowSize(SDL_Window * window, int w,
   1.148                                                 int h);
   1.149  
   1.150  /**
   1.151 @@ -649,7 +661,7 @@
   1.152   *  
   1.153   *  \sa SDL_SetWindowSize()
   1.154   */
   1.155 -extern DECLSPEC void SDLCALL SDL_GetWindowSize(SDL_WindowID windowID, int *w,
   1.156 +extern DECLSPEC void SDLCALL SDL_GetWindowSize(SDL_Window * window, int *w,
   1.157                                                 int *h);
   1.158  
   1.159  /**
   1.160 @@ -657,33 +669,33 @@
   1.161   *  
   1.162   *  \sa SDL_HideWindow()
   1.163   */
   1.164 -extern DECLSPEC void SDLCALL SDL_ShowWindow(SDL_WindowID windowID);
   1.165 +extern DECLSPEC void SDLCALL SDL_ShowWindow(SDL_Window * window);
   1.166  
   1.167  /**
   1.168   *  \brief Hide the window.
   1.169   *  
   1.170   *  \sa SDL_ShowWindow()
   1.171   */
   1.172 -extern DECLSPEC void SDLCALL SDL_HideWindow(SDL_WindowID windowID);
   1.173 +extern DECLSPEC void SDLCALL SDL_HideWindow(SDL_Window * window);
   1.174  
   1.175  /**
   1.176   *  \brief Raise the window above other windows and set the input focus.
   1.177   */
   1.178 -extern DECLSPEC void SDLCALL SDL_RaiseWindow(SDL_WindowID windowID);
   1.179 +extern DECLSPEC void SDLCALL SDL_RaiseWindow(SDL_Window * window);
   1.180  
   1.181  /**
   1.182   *  \brief Make the window as large as possible.
   1.183   *  
   1.184   *  \sa SDL_RestoreWindow()
   1.185   */
   1.186 -extern DECLSPEC void SDLCALL SDL_MaximizeWindow(SDL_WindowID windowID);
   1.187 +extern DECLSPEC void SDLCALL SDL_MaximizeWindow(SDL_Window * window);
   1.188  
   1.189  /**
   1.190   *  \brief Minimize the window to an iconic representation.
   1.191   *  
   1.192   *  \sa SDL_RestoreWindow()
   1.193   */
   1.194 -extern DECLSPEC void SDLCALL SDL_MinimizeWindow(SDL_WindowID windowID);
   1.195 +extern DECLSPEC void SDLCALL SDL_MinimizeWindow(SDL_Window * window);
   1.196  
   1.197  /**
   1.198   *  \brief Restore the size and position of a minimized or maximized window.
   1.199 @@ -691,7 +703,7 @@
   1.200   *  \sa SDL_MaximizeWindow()
   1.201   *  \sa SDL_MinimizeWindow()
   1.202   */
   1.203 -extern DECLSPEC void SDLCALL SDL_RestoreWindow(SDL_WindowID windowID);
   1.204 +extern DECLSPEC void SDLCALL SDL_RestoreWindow(SDL_Window * window);
   1.205  
   1.206  /**
   1.207   *  \brief Set the window's fullscreen state.
   1.208 @@ -701,7 +713,7 @@
   1.209   *  \sa SDL_SetWindowDisplayMode()
   1.210   *  \sa SDL_GetWindowDisplayMode()
   1.211   */
   1.212 -extern DECLSPEC int SDLCALL SDL_SetWindowFullscreen(SDL_WindowID windowID,
   1.213 +extern DECLSPEC int SDLCALL SDL_SetWindowFullscreen(SDL_Window * window,
   1.214                                                      int fullscreen);
   1.215  
   1.216  /**
   1.217 @@ -711,7 +723,7 @@
   1.218   *  
   1.219   *  \sa SDL_GetWindowGrab()
   1.220   */
   1.221 -extern DECLSPEC void SDLCALL SDL_SetWindowGrab(SDL_WindowID windowID,
   1.222 +extern DECLSPEC void SDLCALL SDL_SetWindowGrab(SDL_Window * window,
   1.223                                                 int mode);
   1.224  
   1.225  /**
   1.226 @@ -721,7 +733,7 @@
   1.227   *  
   1.228   *  \sa SDL_SetWindowGrab()
   1.229   */
   1.230 -extern DECLSPEC int SDLCALL SDL_GetWindowGrab(SDL_WindowID windowID);
   1.231 +extern DECLSPEC int SDLCALL SDL_GetWindowGrab(SDL_Window * window);
   1.232  
   1.233  /**
   1.234   *  \brief Get driver specific information about a window.
   1.235 @@ -729,14 +741,14 @@
   1.236   *  \note Include SDL_syswm.h for the declaration of SDL_SysWMinfo.
   1.237   */
   1.238  struct SDL_SysWMinfo;
   1.239 -extern DECLSPEC SDL_bool SDLCALL SDL_GetWindowWMInfo(SDL_WindowID windowID,
   1.240 +extern DECLSPEC SDL_bool SDLCALL SDL_GetWindowWMInfo(SDL_Window * window,
   1.241                                                       struct SDL_SysWMinfo
   1.242                                                       *info);
   1.243  
   1.244  /**
   1.245   *  \brief Destroy a window.
   1.246   */
   1.247 -extern DECLSPEC void SDLCALL SDL_DestroyWindow(SDL_WindowID windowID);
   1.248 +extern DECLSPEC void SDLCALL SDL_DestroyWindow(SDL_Window * window);
   1.249  
   1.250  /**
   1.251   *  \brief Get the number of 2D rendering drivers available for the current 
   1.252 @@ -769,7 +781,7 @@
   1.253  /**
   1.254   *  \brief Create and make active a 2D rendering context for a window.
   1.255   *  
   1.256 - *  \param windowID The window where rendering is displayed.
   1.257 + *  \param window The window where rendering is displayed.
   1.258   *  \param index    The index of the rendering driver to initialize, or -1 to 
   1.259   *                  initialize the first one supporting the requested flags.
   1.260   *  \param flags    ::SDL_RendererFlags.
   1.261 @@ -780,7 +792,7 @@
   1.262   *  \sa SDL_GetRendererInfo()
   1.263   *  \sa SDL_DestroyRenderer()
   1.264   */
   1.265 -extern DECLSPEC int SDLCALL SDL_CreateRenderer(SDL_WindowID windowID,
   1.266 +extern DECLSPEC int SDLCALL SDL_CreateRenderer(SDL_Window * window,
   1.267                                                 int index, Uint32 flags);
   1.268  
   1.269  /**
   1.270 @@ -789,7 +801,7 @@
   1.271   *  \return 0 on success, -1 if the selected window doesn't have a
   1.272   *          rendering context.
   1.273   */
   1.274 -extern DECLSPEC int SDLCALL SDL_SelectRenderer(SDL_WindowID windowID);
   1.275 +extern DECLSPEC int SDLCALL SDL_SelectRenderer(SDL_Window * window);
   1.276  
   1.277  /**
   1.278   *  \brief Get information about the current rendering context.
   1.279 @@ -811,7 +823,7 @@
   1.280   *  \sa SDL_QueryTexture()
   1.281   *  \sa SDL_DestroyTexture()
   1.282   */
   1.283 -extern DECLSPEC SDL_TextureID SDLCALL SDL_CreateTexture(Uint32 format,
   1.284 +extern DECLSPEC SDL_Texture * SDLCALL SDL_CreateTexture(Uint32 format,
   1.285                                                          int access, int w,
   1.286                                                          int h);
   1.287  
   1.288 @@ -830,7 +842,7 @@
   1.289   *  \sa SDL_QueryTexture()
   1.290   *  \sa SDL_DestroyTexture()
   1.291   */
   1.292 -extern DECLSPEC SDL_TextureID SDLCALL SDL_CreateTextureFromSurface(Uint32
   1.293 +extern DECLSPEC SDL_Texture * SDLCALL SDL_CreateTextureFromSurface(Uint32
   1.294                                                                     format,
   1.295                                                                     SDL_Surface
   1.296                                                                     * surface);
   1.297 @@ -838,7 +850,7 @@
   1.298  /**
   1.299   *  \brief Query the attributes of a texture
   1.300   *  
   1.301 - *  \param textureID A texture to be queried.
   1.302 + *  \param texture A texture to be queried.
   1.303   *  \param format  A pointer filled in with the raw format of the texture.  The 
   1.304   *                 actual format may differ, but pixel transfers will use this 
   1.305   *                 format.
   1.306 @@ -848,7 +860,7 @@
   1.307   *  
   1.308   *  \return 0 on success, or -1 if the texture is not valid.
   1.309   */
   1.310 -extern DECLSPEC int SDLCALL SDL_QueryTexture(SDL_TextureID textureID,
   1.311 +extern DECLSPEC int SDLCALL SDL_QueryTexture(SDL_Texture * texture,
   1.312                                               Uint32 * format, int *access,
   1.313                                               int *w, int *h);
   1.314  
   1.315 @@ -856,7 +868,7 @@
   1.316   *  \brief Query the pixels of a texture, if the texture does not need to be 
   1.317   *         locked for pixel access.
   1.318   *  
   1.319 - *  \param textureID A texture to be queried, which was created with 
   1.320 + *  \param texture A texture to be queried, which was created with 
   1.321   *                   ::SDL_TEXTUREACCESS_STREAMING.
   1.322   *  \param pixels    A pointer filled with a pointer to the pixels for the 
   1.323   *                   texture.
   1.324 @@ -865,13 +877,13 @@
   1.325   *  \return 0 on success, or -1 if the texture is not valid, or must be locked 
   1.326   *          for pixel access.
   1.327   */
   1.328 -extern DECLSPEC int SDLCALL SDL_QueryTexturePixels(SDL_TextureID textureID,
   1.329 +extern DECLSPEC int SDLCALL SDL_QueryTexturePixels(SDL_Texture * texture,
   1.330                                                     void **pixels, int *pitch);
   1.331  
   1.332  /**
   1.333   *  \brief Set the color palette of an indexed texture.
   1.334   *  
   1.335 - *  \param textureID  The texture to update.
   1.336 + *  \param texture  The texture to update.
   1.337   *  \param colors     The array of RGB color data.
   1.338   *  \param firstcolor The first index to update.
   1.339   *  \param ncolors    The number of palette entries to fill with the color data.
   1.340 @@ -879,7 +891,7 @@
   1.341   *  \return 0 on success, or -1 if the texture is not valid or not an indexed 
   1.342   *          texture.
   1.343   */
   1.344 -extern DECLSPEC int SDLCALL SDL_SetTexturePalette(SDL_TextureID textureID,
   1.345 +extern DECLSPEC int SDLCALL SDL_SetTexturePalette(SDL_Texture * texture,
   1.346                                                    const SDL_Color * colors,
   1.347                                                    int firstcolor,
   1.348                                                    int ncolors);
   1.349 @@ -887,7 +899,7 @@
   1.350  /**
   1.351   *  \brief Get the color palette from an indexed texture if it has one.
   1.352   *  
   1.353 - *  \param textureID  The texture to update.
   1.354 + *  \param texture  The texture to update.
   1.355   *  \param colors     The array to fill with RGB color data.
   1.356   *  \param firstcolor The first index to retrieve.
   1.357   *  \param ncolors    The number of palette entries to retrieve.
   1.358 @@ -895,7 +907,7 @@
   1.359   *  \return 0 on success, or -1 if the texture is not valid or not an indexed 
   1.360   *          texture.
   1.361   */
   1.362 -extern DECLSPEC int SDLCALL SDL_GetTexturePalette(SDL_TextureID textureID,
   1.363 +extern DECLSPEC int SDLCALL SDL_GetTexturePalette(SDL_Texture * texture,
   1.364                                                    SDL_Color * colors,
   1.365                                                    int firstcolor,
   1.366                                                    int ncolors);
   1.367 @@ -903,7 +915,7 @@
   1.368  /**
   1.369   *  \brief Set an additional color value used in render copy operations.
   1.370   *  
   1.371 - *  \param textureID The texture to update.
   1.372 + *  \param texture The texture to update.
   1.373   *  \param r       The red source color value multiplied into copy operations.
   1.374   *  \param g       The green source color value multiplied into copy operations.
   1.375   *  \param b       The blue source color value multiplied into copy operations.
   1.376 @@ -913,14 +925,14 @@
   1.377   *  
   1.378   *  \sa SDL_GetTextureColorMod()
   1.379   */
   1.380 -extern DECLSPEC int SDLCALL SDL_SetTextureColorMod(SDL_TextureID textureID,
   1.381 +extern DECLSPEC int SDLCALL SDL_SetTextureColorMod(SDL_Texture * texture,
   1.382                                                     Uint8 r, Uint8 g, Uint8 b);
   1.383  
   1.384  
   1.385  /**
   1.386   *  \brief Get the additional color value used in render copy operations.
   1.387   *  
   1.388 - *  \param textureID The texture to query.
   1.389 + *  \param texture The texture to query.
   1.390   *  \param r         A pointer filled in with the source red color value.
   1.391   *  \param g         A pointer filled in with the source green color value.
   1.392   *  \param b         A pointer filled in with the source blue color value.
   1.393 @@ -929,14 +941,14 @@
   1.394   *  
   1.395   *  \sa SDL_SetTextureColorMod()
   1.396   */
   1.397 -extern DECLSPEC int SDLCALL SDL_GetTextureColorMod(SDL_TextureID textureID,
   1.398 +extern DECLSPEC int SDLCALL SDL_GetTextureColorMod(SDL_Texture * texture,
   1.399                                                     Uint8 * r, Uint8 * g,
   1.400                                                     Uint8 * b);
   1.401  
   1.402  /**
   1.403   *  \brief Set an additional alpha value used in render copy operations.
   1.404   *  
   1.405 - *  \param textureID The texture to update.
   1.406 + *  \param texture The texture to update.
   1.407   *  \param alpha     The source alpha value multiplied into copy operations.
   1.408   *  
   1.409   *  \return 0 on success, or -1 if the texture is not valid or alpha modulation 
   1.410 @@ -944,26 +956,26 @@
   1.411   *  
   1.412   *  \sa SDL_GetTextureAlphaMod()
   1.413   */
   1.414 -extern DECLSPEC int SDLCALL SDL_SetTextureAlphaMod(SDL_TextureID textureID,
   1.415 +extern DECLSPEC int SDLCALL SDL_SetTextureAlphaMod(SDL_Texture * texture,
   1.416                                                     Uint8 alpha);
   1.417  
   1.418  /**
   1.419   *  \brief Get the additional alpha value used in render copy operations.
   1.420   *  
   1.421 - *  \param textureID The texture to query.
   1.422 + *  \param texture The texture to query.
   1.423   *  \param alpha     A pointer filled in with the source alpha value.
   1.424   *  
   1.425   *  \return 0 on success, or -1 if the texture is not valid.
   1.426   *  
   1.427   *  \sa SDL_SetTextureAlphaMod()
   1.428   */
   1.429 -extern DECLSPEC int SDLCALL SDL_GetTextureAlphaMod(SDL_TextureID textureID,
   1.430 +extern DECLSPEC int SDLCALL SDL_GetTextureAlphaMod(SDL_Texture * texture,
   1.431                                                     Uint8 * alpha);
   1.432  
   1.433  /**
   1.434   *  \brief Set the blend mode used for texture copy operations.
   1.435   *  
   1.436 - *  \param textureID The texture to update.
   1.437 + *  \param texture The texture to update.
   1.438   *  \param blendMode ::SDL_BlendMode to use for texture blending.
   1.439   *  
   1.440   *  \return 0 on success, or -1 if the texture is not valid or the blend mode is
   1.441 @@ -974,26 +986,26 @@
   1.442   *  
   1.443   *  \sa SDL_GetTextureBlendMode()
   1.444   */
   1.445 -extern DECLSPEC int SDLCALL SDL_SetTextureBlendMode(SDL_TextureID textureID,
   1.446 +extern DECLSPEC int SDLCALL SDL_SetTextureBlendMode(SDL_Texture * texture,
   1.447                                                      int blendMode);
   1.448  
   1.449  /**
   1.450   *  \brief Get the blend mode used for texture copy operations.
   1.451   *  
   1.452 - *  \param textureID The texture to query.
   1.453 + *  \param texture The texture to query.
   1.454   *  \param blendMode A pointer filled in with the current blend mode.
   1.455   *  
   1.456   *  \return 0 on success, or -1 if the texture is not valid.
   1.457   *  
   1.458   *  \sa SDL_SetTextureBlendMode()
   1.459   */
   1.460 -extern DECLSPEC int SDLCALL SDL_GetTextureBlendMode(SDL_TextureID textureID,
   1.461 +extern DECLSPEC int SDLCALL SDL_GetTextureBlendMode(SDL_Texture * texture,
   1.462                                                      int *blendMode);
   1.463  
   1.464  /**
   1.465   *  \brief Set the scale mode used for texture copy operations.
   1.466   *  
   1.467 - *  \param textureID The texture to update.
   1.468 + *  \param texture The texture to update.
   1.469   *  \param scaleMode ::SDL_TextureScaleMode to use for texture scaling.
   1.470   *  
   1.471   *  \return 0 on success, or -1 if the texture is not valid or the scale mode is
   1.472 @@ -1004,26 +1016,26 @@
   1.473   *  
   1.474   *  \sa SDL_GetTextureScaleMode()
   1.475   */
   1.476 -extern DECLSPEC int SDLCALL SDL_SetTextureScaleMode(SDL_TextureID textureID,
   1.477 +extern DECLSPEC int SDLCALL SDL_SetTextureScaleMode(SDL_Texture * texture,
   1.478                                                      int scaleMode);
   1.479  
   1.480  /**
   1.481   *  \brief Get the scale mode used for texture copy operations.
   1.482   *  
   1.483 - *  \param textureID The texture to query.
   1.484 + *  \param texture The texture to query.
   1.485   *  \param scaleMode A pointer filled in with the current scale mode.
   1.486   *  
   1.487   *  \return 0 on success, or -1 if the texture is not valid.
   1.488   *  
   1.489   *  \sa SDL_SetTextureScaleMode()
   1.490   */
   1.491 -extern DECLSPEC int SDLCALL SDL_GetTextureScaleMode(SDL_TextureID textureID,
   1.492 +extern DECLSPEC int SDLCALL SDL_GetTextureScaleMode(SDL_Texture * texture,
   1.493                                                      int *scaleMode);
   1.494  
   1.495  /**
   1.496   *  \brief Update the given texture rectangle with new pixel data.
   1.497   *  
   1.498 - *  \param textureID The texture to update
   1.499 + *  \param texture The texture to update
   1.500   *  \param rect      A pointer to the rectangle of pixels to update, or NULL to 
   1.501   *                   update the entire texture.
   1.502   *  \param pixels    The raw pixel data.
   1.503 @@ -1033,14 +1045,14 @@
   1.504   *  
   1.505   *  \note This is a fairly slow function.
   1.506   */
   1.507 -extern DECLSPEC int SDLCALL SDL_UpdateTexture(SDL_TextureID textureID,
   1.508 +extern DECLSPEC int SDLCALL SDL_UpdateTexture(SDL_Texture * texture,
   1.509                                                const SDL_Rect * rect,
   1.510                                                const void *pixels, int pitch);
   1.511  
   1.512  /**
   1.513   *  \brief Lock a portion of the texture for pixel access.
   1.514   *  
   1.515 - *  \param textureID The texture to lock for access, which was created with 
   1.516 + *  \param texture The texture to lock for access, which was created with 
   1.517   *                   ::SDL_TEXTUREACCESS_STREAMING.
   1.518   *  \param rect      A pointer to the rectangle to lock for access. If the rect 
   1.519   *                   is NULL, the entire texture will be locked.
   1.520 @@ -1056,7 +1068,7 @@
   1.521   *  \sa SDL_DirtyTexture()
   1.522   *  \sa SDL_UnlockTexture()
   1.523   */
   1.524 -extern DECLSPEC int SDLCALL SDL_LockTexture(SDL_TextureID textureID,
   1.525 +extern DECLSPEC int SDLCALL SDL_LockTexture(SDL_Texture * texture,
   1.526                                              const SDL_Rect * rect,
   1.527                                              int markDirty, void **pixels,
   1.528                                              int *pitch);
   1.529 @@ -1067,12 +1079,12 @@
   1.530   *  \sa SDL_LockTexture()
   1.531   *  \sa SDL_DirtyTexture()
   1.532   */
   1.533 -extern DECLSPEC void SDLCALL SDL_UnlockTexture(SDL_TextureID textureID);
   1.534 +extern DECLSPEC void SDLCALL SDL_UnlockTexture(SDL_Texture * texture);
   1.535  
   1.536  /**
   1.537   *  \brief Mark the specified rectangles of the texture as dirty.
   1.538   *  
   1.539 - *  \param textureID The texture to mark dirty, which was created with 
   1.540 + *  \param texture The texture to mark dirty, which was created with 
   1.541   *                   ::SDL_TEXTUREACCESS_STREAMING.
   1.542   *  \param numrects  The number of rectangles pointed to by rects.
   1.543   *  \param rects     The pointer to an array of dirty rectangles.
   1.544 @@ -1080,7 +1092,7 @@
   1.545   *  \sa SDL_LockTexture()
   1.546   *  \sa SDL_UnlockTexture()
   1.547   */
   1.548 -extern DECLSPEC void SDLCALL SDL_DirtyTexture(SDL_TextureID textureID,
   1.549 +extern DECLSPEC void SDLCALL SDL_DirtyTexture(SDL_Texture * texture,
   1.550                                                int numrects,
   1.551                                                const SDL_Rect * rects);
   1.552  
   1.553 @@ -1228,7 +1240,7 @@
   1.554  /**
   1.555   *  \brief Copy a portion of the texture to the current rendering target.
   1.556   *  
   1.557 - *  \param textureID The source texture.
   1.558 + *  \param texture The source texture.
   1.559   *  \param srcrect   A pointer to the source rectangle, or NULL for the entire 
   1.560   *                   texture.
   1.561   *  \param dstrect   A pointer to the destination rectangle, or NULL for the 
   1.562 @@ -1237,7 +1249,7 @@
   1.563   *  \return 0 on success, or -1 if there is no rendering context current, or the
   1.564   *          driver doesn't support the requested operation.
   1.565   */
   1.566 -extern DECLSPEC int SDLCALL SDL_RenderCopy(SDL_TextureID textureID,
   1.567 +extern DECLSPEC int SDLCALL SDL_RenderCopy(SDL_Texture * texture,
   1.568                                             const SDL_Rect * srcrect,
   1.569                                             const SDL_Rect * dstrect);
   1.570  
   1.571 @@ -1289,7 +1301,7 @@
   1.572   *  \sa SDL_CreateTexture()
   1.573   *  \sa SDL_CreateTextureFromSurface()
   1.574   */
   1.575 -extern DECLSPEC void SDLCALL SDL_DestroyTexture(SDL_TextureID textureID);
   1.576 +extern DECLSPEC void SDLCALL SDL_DestroyTexture(SDL_Texture * texture);
   1.577  
   1.578  /**
   1.579   *  \brief Destroy the rendering context for a window and free associated
   1.580 @@ -1297,7 +1309,7 @@
   1.581   *  
   1.582   *  \sa SDL_CreateRenderer()
   1.583   */
   1.584 -extern DECLSPEC void SDLCALL SDL_DestroyRenderer(SDL_WindowID windowID);
   1.585 +extern DECLSPEC void SDLCALL SDL_DestroyRenderer(SDL_Window * window);
   1.586  
   1.587  /**
   1.588   *  \brief Returns whether the screensaver is currently enabled (default off).
   1.589 @@ -1384,15 +1396,15 @@
   1.590   *  
   1.591   *  \sa SDL_GL_DeleteContext()
   1.592   */
   1.593 -extern DECLSPEC SDL_GLContext SDLCALL SDL_GL_CreateContext(SDL_WindowID
   1.594 -                                                           windowID);
   1.595 +extern DECLSPEC SDL_GLContext SDLCALL SDL_GL_CreateContext(SDL_Window *
   1.596 +                                                           window);
   1.597  
   1.598  /**
   1.599   *  \brief Set up an OpenGL context for rendering into an OpenGL window.
   1.600   *  
   1.601   *  \note The context must have been created with a compatible window.
   1.602   */
   1.603 -extern DECLSPEC int SDLCALL SDL_GL_MakeCurrent(SDL_WindowID windowID,
   1.604 +extern DECLSPEC int SDLCALL SDL_GL_MakeCurrent(SDL_Window * window,
   1.605                                                 SDL_GLContext context);
   1.606  
   1.607  /**
   1.608 @@ -1422,7 +1434,7 @@
   1.609   * \brief Swap the OpenGL buffers for the window, if double-buffering is 
   1.610   *        supported.
   1.611   */
   1.612 -extern DECLSPEC void SDLCALL SDL_GL_SwapWindow(SDL_WindowID windowID);
   1.613 +extern DECLSPEC void SDLCALL SDL_GL_SwapWindow(SDL_Window * window);
   1.614  
   1.615  /**
   1.616   *  \brief Delete an OpenGL context.