Removed all the automatic batching stuff and replaced it with a more straight-forward implementation using a state cache for optimizing performances
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1362 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
LaurentGom
parent
8ba9495c02
commit
c237305f9b
58 changed files with 890 additions and 2039 deletions
|
|
@ -84,22 +84,20 @@ CSFML_API unsigned int sfRenderImage_GetHeight(const sfRenderImage* renderImage)
|
|||
CSFML_API sfBool sfRenderImage_SetActive(sfRenderImage* renderImage, sfBool active);
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Make sure that what has been drawn so far is rendered
|
||||
/// Save the current OpenGL render states and matrices
|
||||
///
|
||||
/// Use this function if you use OpenGL rendering commands,
|
||||
/// and you want to make sure that things will appear on top
|
||||
/// of all the SFML objects that have been drawn so far.
|
||||
/// This is needed because SFML doesn't use immediate rendering,
|
||||
/// it first accumulates drawables into a queue and
|
||||
/// trigger the actual rendering afterwards.
|
||||
///
|
||||
/// You don't need to call this function if you're not
|
||||
/// dealing with OpenGL directly.
|
||||
///
|
||||
/// \param Renderimage : Renderimage object
|
||||
/// \param renderWindow : Renderwindow object
|
||||
///
|
||||
////////////////////////////////////////////////////////////
|
||||
CSFML_API void sfRenderImage_Flush(sfRenderImage* renderImage);
|
||||
CSFML_API void sfRenderImage_SaveGLStates(sfRenderImage* renderImage);
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Restore the previously saved OpenGL render states and matrices
|
||||
///
|
||||
/// \param renderWindow : Renderwindow object
|
||||
///
|
||||
////////////////////////////////////////////////////////////
|
||||
CSFML_API void sfRenderImage_RestoreGLStates(sfRenderImage* renderImage);
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Update the contents of the target image
|
||||
|
|
|
|||
|
|
@ -225,22 +225,20 @@ CSFML_API void sfRenderWindow_SetIcon(sfRenderWindow* renderWindow, unsigned int
|
|||
CSFML_API sfBool sfRenderWindow_SetActive(sfRenderWindow* renderWindow, sfBool active);
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Make sure that what has been drawn so far is rendered
|
||||
///
|
||||
/// Use this function if you use OpenGL rendering commands,
|
||||
/// and you want to make sure that things will appear on top
|
||||
/// of all the SFML objects that have been drawn so far.
|
||||
/// This is needed because SFML doesn't use immediate rendering,
|
||||
/// it first accumulates drawables into a queue and
|
||||
/// trigger the actual rendering afterwards.
|
||||
///
|
||||
/// You don't need to call this function if you're not
|
||||
/// dealing with OpenGL directly.
|
||||
/// Save the current OpenGL render states and matrices
|
||||
///
|
||||
/// \param renderWindow : Renderwindow object
|
||||
///
|
||||
////////////////////////////////////////////////////////////
|
||||
CSFML_API void sfRenderWindow_Flush(sfRenderWindow* renderWindow);
|
||||
CSFML_API void sfRenderWindow_SaveGLStates(sfRenderWindow* renderWindow);
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Restore the previously saved OpenGL render states and matrices
|
||||
///
|
||||
/// \param renderWindow : Renderwindow object
|
||||
///
|
||||
////////////////////////////////////////////////////////////
|
||||
CSFML_API void sfRenderWindow_RestoreGLStates(sfRenderWindow* renderWindow);
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Display a window on screen
|
||||
|
|
|
|||
|
|
@ -87,21 +87,20 @@ sfBool sfRenderImage_SetActive(sfRenderImage* renderImage, sfBool active)
|
|||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Make sure that what has been drawn so far is rendered
|
||||
///
|
||||
/// Use this function if you use OpenGL rendering commands,
|
||||
/// and you want to make sure that things will appear on top
|
||||
/// of all the SFML objects that have been drawn so far.
|
||||
/// This is needed because SFML doesn't use immediate rendering,
|
||||
/// it first accumulates drawables into a queue and
|
||||
/// trigger the actual rendering afterwards.
|
||||
///
|
||||
/// You don't need to call this function if you're not
|
||||
/// dealing with OpenGL directly.
|
||||
/// Save the current OpenGL render states and matrices
|
||||
////////////////////////////////////////////////////////////
|
||||
void sfRenderImage_Flush(sfRenderImage* renderImage)
|
||||
void sfRenderImage_SaveGLStates(sfRenderImage* renderImage)
|
||||
{
|
||||
CSFML_CALL(renderImage, Flush())
|
||||
CSFML_CALL(renderImage, SaveGLStates());
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Restore the previously saved OpenGL render states and matrices
|
||||
////////////////////////////////////////////////////////////
|
||||
void sfRenderImage_RestoreGLStates(sfRenderImage* renderImage)
|
||||
{
|
||||
CSFML_CALL(renderImage, RestoreGLStates());
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -285,22 +285,20 @@ sfBool sfRenderWindow_SetActive(sfRenderWindow* renderWindow, sfBool active)
|
|||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Make sure that what has been drawn so far is rendered
|
||||
///
|
||||
/// Use this function if you use OpenGL rendering commands,
|
||||
/// and you want to make sure that things will appear on top
|
||||
/// of all the SFML objects that have been drawn so far.
|
||||
/// This is needed because SFML doesn't use immediate rendering,
|
||||
/// it first accumulates drawables into a queue and
|
||||
/// trigger the actual rendering afterwards.
|
||||
///
|
||||
/// You don't need to call this function if you're not
|
||||
/// dealing with OpenGL directly.
|
||||
///
|
||||
/// Save the current OpenGL render states and matrices
|
||||
////////////////////////////////////////////////////////////
|
||||
void sfRenderWindow_Flush(sfRenderWindow* renderWindow)
|
||||
void sfRenderWindow_SaveGLStates(sfRenderWindow* renderWindow)
|
||||
{
|
||||
CSFML_CALL(renderWindow, Flush())
|
||||
CSFML_CALL(renderWindow, SaveGLStates());
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Restore the previously saved OpenGL render states and matrices
|
||||
////////////////////////////////////////////////////////////
|
||||
void sfRenderWindow_RestoreGLStates(sfRenderWindow* renderWindow)
|
||||
{
|
||||
CSFML_CALL(renderWindow, RestoreGLStates());
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -181,7 +181,8 @@ EXPORTS
|
|||
sfRenderImage_GetWidth
|
||||
sfRenderImage_GetHeight
|
||||
sfRenderImage_SetActive
|
||||
sfRenderImage_Flush
|
||||
sfRenderImage_SaveGLStates
|
||||
sfRenderImage_RestoreGLStates
|
||||
sfRenderImage_Display
|
||||
sfRenderImage_DrawSprite
|
||||
sfRenderImage_DrawShape
|
||||
|
|
@ -216,7 +217,8 @@ EXPORTS
|
|||
sfRenderWindow_EnableKeyRepeat
|
||||
sfRenderWindow_SetIcon
|
||||
sfRenderWindow_SetActive
|
||||
sfRenderWindow_Flush
|
||||
sfRenderWindow_SaveGLStates
|
||||
sfRenderWindow_RestoreGLStates
|
||||
sfRenderWindow_Display
|
||||
sfRenderWindow_GetInput
|
||||
sfRenderWindow_SetFramerateLimit
|
||||
|
|
|
|||
|
|
@ -181,7 +181,8 @@ EXPORTS
|
|||
sfRenderImage_GetWidth
|
||||
sfRenderImage_GetHeight
|
||||
sfRenderImage_SetActive
|
||||
sfRenderImage_Flush
|
||||
sfRenderImage_SaveGLStates
|
||||
sfRenderImage_RestoreGLStates
|
||||
sfRenderImage_Display
|
||||
sfRenderImage_DrawSprite
|
||||
sfRenderImage_DrawShape
|
||||
|
|
@ -216,7 +217,8 @@ EXPORTS
|
|||
sfRenderWindow_EnableKeyRepeat
|
||||
sfRenderWindow_SetIcon
|
||||
sfRenderWindow_SetActive
|
||||
sfRenderWindow_Flush
|
||||
sfRenderWindow_SaveGLStates
|
||||
sfRenderWindow_RestoreGLStates
|
||||
sfRenderWindow_Display
|
||||
sfRenderWindow_GetInput
|
||||
sfRenderWindow_SetFramerateLimit
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue