[Commits] [wesnoth/wesnoth] 9cce85: Import SDL_gpu sources.

Sat Jul 5 10:01:54 UTC 2014

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 9cce856aa0ef844d66117267ce1b4295c0b0d0ec
      https://github.com/wesnoth/wesnoth/commit/9cce856aa0ef844d66117267ce1b4295c0b0d0ec
  Author: Boldizsár Lipka <lipkab at zoho.com>
  Date:   2014-06-27 (Fri, 27 Jun 2014)

  Changed paths:
    M src/CMakeLists.txt
    A src/SDL_gpu/CMake_scripts/FindFFMPEG.cmake
    A src/SDL_gpu/CMake_scripts/FindOpenGLES.cmake
    A src/SDL_gpu/CMake_scripts/FindPkgMacros.cmake
    A src/SDL_gpu/CMake_scripts/FindSDL2.cmake
    A src/SDL_gpu/Doxyfile
    A src/SDL_gpu/README-wesnoth
    A src/SDL_gpu/README.txt
    A src/SDL_gpu/SDL_gpu/Android.mk
    A src/SDL_gpu/SDL_gpu/GLES_1/SDL_gpu_GLES_1.c
    A src/SDL_gpu/SDL_gpu/GLES_1/SDL_gpu_GLES_1.h
    A src/SDL_gpu/SDL_gpu/GLES_2/SDL_gpu_GLES_2.c
    A src/SDL_gpu/SDL_gpu/GLES_2/SDL_gpu_GLES_2.h
    A src/SDL_gpu/SDL_gpu/GL_common/SDL_gpuShapes_GL_common.inl
    A src/SDL_gpu/SDL_gpu/GL_common/SDL_gpu_GL_common.inl
    A src/SDL_gpu/SDL_gpu/GL_common/SDL_gpu_GL_matrix.c
    A src/SDL_gpu/SDL_gpu/GL_common/SDL_gpu_GL_matrix.h
    A src/SDL_gpu/SDL_gpu/OpenGL_1/SDL_gpu_OpenGL_1.c
    A src/SDL_gpu/SDL_gpu/OpenGL_1/SDL_gpu_OpenGL_1.h
    A src/SDL_gpu/SDL_gpu/OpenGL_1_BASE/SDL_gpu_OpenGL_1_BASE.c
    A src/SDL_gpu/SDL_gpu/OpenGL_1_BASE/SDL_gpu_OpenGL_1_BASE.h
    A src/SDL_gpu/SDL_gpu/OpenGL_2/SDL_gpu_OpenGL_2.c
    A src/SDL_gpu/SDL_gpu/OpenGL_2/SDL_gpu_OpenGL_2.h
    A src/SDL_gpu/SDL_gpu/OpenGL_3/SDL_gpu_OpenGL_3.c
    A src/SDL_gpu/SDL_gpu/OpenGL_3/SDL_gpu_OpenGL_3.h
    A src/SDL_gpu/SDL_gpu/SDL_gpu.c
    A src/SDL_gpu/SDL_gpu/SDL_gpu.h
    A src/SDL_gpu/SDL_gpu/SDL_gpuConfig.cmake
    A src/SDL_gpu/SDL_gpu/SDL_gpuShapes.c
    A src/SDL_gpu/SDL_gpu/SDL_gpu_Renderer.c
    A src/SDL_gpu/SDL_gpu/externals/glew/glew.c
    A src/SDL_gpu/SDL_gpu/externals/glew/glew.h
    A src/SDL_gpu/SDL_gpu/externals/glew/glxew.h
    A src/SDL_gpu/SDL_gpu/externals/glew/wglew.h
    A src/SDL_gpu/SDL_gpu/externals/stb_image/stb_image.c
    A src/SDL_gpu/SDL_gpu/externals/stb_image/stb_image.h
    A src/SDL_gpu/SDL_gpu/externals/stb_image/stb_image_write.c
    A src/SDL_gpu/SDL_gpu/externals/stb_image/stb_image_write.h
    A src/SDL_gpu/SDL_gpu/mainpage.dox

  Log Message:
  -----------
  Import SDL_gpu sources.

NOTE: no SCons build yet.

  Commit: fba9a360ccbc0270da24bbba0feeaa323fda1714
      https://github.com/wesnoth/wesnoth/commit/fba9a360ccbc0270da24bbba0feeaa323fda1714
  Author: Boldizsár Lipka <lipkab at zoho.com>
  Date:   2014-06-27 (Fri, 27 Jun 2014)

  Changed paths:
    M src/video.cpp
    M src/video.hpp

  Log Message:
  -----------
  Enable OpenGL rendering.

  Commit: 4ff6e0b61c1b744b0075df864f4f8d6616956905
      https://github.com/wesnoth/wesnoth/commit/4ff6e0b61c1b744b0075df864f4f8d6616956905
  Author: Boldizsár Lipka <lipkab at zoho.com>
  Date:   2014-06-27 (Fri, 27 Jun 2014)

  Changed paths:
    A src/sdl/gpu.hpp
    M src/video.cpp

  Log Message:
  -----------
  Add alias for SDL_gpu/SDL_gpu/SDL_gpu.h.

  Commit: 49e68b094ab4ee1a9c3bd8903f87ae3231d96164
      https://github.com/wesnoth/wesnoth/commit/49e68b094ab4ee1a9c3bd8903f87ae3231d96164
  Author: Boldizsár Lipka <lipkab at zoho.com>
  Date:   2014-06-27 (Fri, 27 Jun 2014)

  Changed paths:
    M src/video.cpp

  Log Message:
  -----------
  Fix GPU_Init flags.

  Commit: ebd6f18c6e6bf7697a57442911661a626922a33c
      https://github.com/wesnoth/wesnoth/commit/ebd6f18c6e6bf7697a57442911661a626922a33c
  Author: Boldizsár Lipka <lipkab at zoho.com>
  Date:   2014-06-27 (Fri, 27 Jun 2014)

  Changed paths:
    M src/loadscreen.cpp
    M src/loadscreen.hpp

  Log Message:
  -----------
  Port the load screen to use SDL_gpu.

  Commit: d60b9c6069e53999f2938af433dd22b140f7c02d
      https://github.com/wesnoth/wesnoth/commit/d60b9c6069e53999f2938af433dd22b140f7c02d
  Author: Boldizsár Lipka <lipkab at zoho.com>
  Date:   2014-06-28 (Sat, 28 Jun 2014)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  Don't ignore CMakeLists.txt.

  Commit: 3238000cd2020884484f58d45169089557c3f77d
      https://github.com/wesnoth/wesnoth/commit/3238000cd2020884484f58d45169089557c3f77d
  Author: Boldizsár Lipka <lipkab at zoho.com>
  Date:   2014-06-28 (Sat, 28 Jun 2014)

  Changed paths:
    A src/SDL_gpu/CMakeLists.txt
    A src/SDL_gpu/SDL_gpu/CMakeLists.txt

  Log Message:
  -----------
  Commit missing CMakeLists for SDL_gpu.

  Commit: ccc1f9e633296619f1a5b373d2b04a28a7fe357d
      https://github.com/wesnoth/wesnoth/commit/ccc1f9e633296619f1a5b373d2b04a28a7fe357d
  Author: Boldizsár Lipka <lipkab at zoho.com>
  Date:   2014-06-29 (Sun, 29 Jun 2014)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  Don't ignore txt files.

  Commit: d5491b0611acecec1273af2ce8ccb9a841e6abeb
      https://github.com/wesnoth/wesnoth/commit/d5491b0611acecec1273af2ce8ccb9a841e6abeb
  Author: Boldizsár Lipka <lipkab at zoho.com>
  Date:   2014-06-29 (Sun, 29 Jun 2014)

  Changed paths:
    M src/SDL_gpu/CMakeLists.txt

  Log Message:
  -----------
  Fix SDL_gpu CMake build.

Patch provided by mordante.

  Commit: c2d7265718adbe191f214250af291f7b14651a50
      https://github.com/wesnoth/wesnoth/commit/c2d7265718adbe191f214250af291f7b14651a50
  Author: Boldizsár Lipka <lipkab at zoho.com>
  Date:   2014-07-01 (Tue, 01 Jul 2014)

  Changed paths:
    M CMakeLists.txt
    M src/CMakeLists.txt
    M src/loadscreen.cpp
    M src/loadscreen.hpp

  Log Message:
  -----------
  Make SDL_gpu an optional dependency.

  Commit: fe1aae79f001dcfa3551af1092a8c8263a71e821
      https://github.com/wesnoth/wesnoth/commit/fe1aae79f001dcfa3551af1092a8c8263a71e821
  Author: Boldizsár Lipka <lipkab at zoho.com>
  Date:   2014-07-01 (Tue, 01 Jul 2014)

  Changed paths:
    M src/loadscreen.cpp
    M src/loadscreen.hpp

  Log Message:
  -----------
  Remove SDL2-specific parts from loadscreen.

  Commit: a98fcc39cd9504276ccdcd8d6f6576523d51c5db
      https://github.com/wesnoth/wesnoth/commit/a98fcc39cd9504276ccdcd8d6f6576523d51c5db
  Author: Boldizsár Lipka <lipkab at zoho.com>
  Date:   2014-07-01 (Tue, 01 Jul 2014)

  Changed paths:
    M src/sdl/rect.cpp
    M src/sdl/rect.hpp

  Log Message:
  -----------
  Add SDL_gpu implementation for fill_rect and draw_rect.

  Commit: 3b2277d0f95b6169fee3e004fc70da7a38688f94
      https://github.com/wesnoth/wesnoth/commit/3b2277d0f95b6169fee3e004fc70da7a38688f94
  Author: Boldizsár Lipka <lipkab at zoho.com>
  Date:   2014-07-01 (Tue, 01 Jul 2014)

  Changed paths:
    M src/sdl/rect.cpp
    M src/sdl/rect.hpp

  Log Message:
  -----------
  Remove SDL2 code from sdl/rect.

  Commit: acef0efa9cefc30ac58d9b554d85b21d7a84cd5e
      https://github.com/wesnoth/wesnoth/commit/acef0efa9cefc30ac58d9b554d85b21d7a84cd5e
  Author: Boldizsár Lipka <lipkab at zoho.com>
  Date:   2014-07-02 (Wed, 02 Jul 2014)

  Changed paths:
    M src/sdl/rect.cpp
    M src/sdl/rect.hpp

  Log Message:
  -----------
  A function to create GPU_Rects easily.

  Commit: 5100fb90475e96558b6ad2ad90428cf0fd43f887
      https://github.com/wesnoth/wesnoth/commit/5100fb90475e96558b6ad2ad90428cf0fd43f887
  Author: Boldizsár Lipka <lipkab at zoho.com>
  Date:   2014-07-03 (Thu, 03 Jul 2014)

  Changed paths:
    M src/sdl/texture.cpp
    M src/sdl/texture.hpp

  Log Message:
  -----------
  SDL_gpu implementation for sdl::ttexture.

  Commit: 90eab469e1d517626282e556880a2869ff94a8ae
      https://github.com/wesnoth/wesnoth/commit/90eab469e1d517626282e556880a2869ff94a8ae
  Author: Boldizsár Lipka <lipkab at zoho.com>
  Date:   2014-07-03 (Thu, 03 Jul 2014)

  Changed paths:
    M src/image.cpp
    M src/image.hpp

  Log Message:
  -----------
  SDL_gpu implementation for get_texture et al.

  Commit: dfc2a57d2dcba2bdc802963df8ffb3b6103e8c17
      https://github.com/wesnoth/wesnoth/commit/dfc2a57d2dcba2bdc802963df8ffb3b6103e8c17
  Author: Boldizsár Lipka <lipkab at zoho.com>
  Date:   2014-07-03 (Thu, 03 Jul 2014)

  Changed paths:
    M src/storyscreen/render.cpp
    M src/storyscreen/render.hpp

  Log Message:
  -----------
  SDL_gpu implementation for rendering background layers.

  Commit: 6db593c6231f253fa434d588da81bebf7010fe50
      https://github.com/wesnoth/wesnoth/commit/6db593c6231f253fa434d588da81bebf7010fe50
  Author: Boldizsár Lipka <lipkab at zoho.com>
  Date:   2014-07-03 (Thu, 03 Jul 2014)

  Changed paths:
    M src/storyscreen/part.cpp
    M src/storyscreen/part.hpp
    M src/storyscreen/render.cpp

  Log Message:
  -----------
  SDL_gpu implementation for rendering floating images.

  Commit: dde5c00d08ed900765c1a4778b37210cc2086aa7
      https://github.com/wesnoth/wesnoth/commit/dde5c00d08ed900765c1a4778b37210cc2086aa7
  Author: Boldizsár Lipka <lipkab at zoho.com>
  Date:   2014-07-03 (Thu, 03 Jul 2014)

  Changed paths:
    M src/text.cpp
    M src/text.hpp

  Log Message:
  -----------
  SDL_gpu implementation for ttext::render_as_texture.

  Commit: b16ded3527ae582eb87caa325ff3eadebe310f14
      https://github.com/wesnoth/wesnoth/commit/b16ded3527ae582eb87caa325ff3eadebe310f14
  Author: Boldizsár Lipka <lipkab at zoho.com>
  Date:   2014-07-03 (Thu, 03 Jul 2014)

  Changed paths:
    M src/text.cpp
    M src/text.hpp

  Log Message:
  -----------
  Remove SDL2 code.

  Commit: 707cda29a0d3db7b6b23649d7392f658e2483244
      https://github.com/wesnoth/wesnoth/commit/707cda29a0d3db7b6b23649d7392f658e2483244
  Author: Boldizsár Lipka <lipkab at zoho.com>
  Date:   2014-07-03 (Thu, 03 Jul 2014)

  Changed paths:
    M src/image.cpp
    M src/image.hpp

  Log Message:
  -----------
  Remove SDL2 code.

  Commit: 8cab56ea1e2a171b6daa64132e9ac9b93211b56a
      https://github.com/wesnoth/wesnoth/commit/8cab56ea1e2a171b6daa64132e9ac9b93211b56a
  Author: Boldizsár Lipka <lipkab at zoho.com>
  Date:   2014-07-03 (Thu, 03 Jul 2014)

  Changed paths:
    M src/storyscreen/part.cpp
    M src/storyscreen/part.hpp
    M src/storyscreen/render.cpp
    M src/storyscreen/render.hpp

  Log Message:
  -----------
  Remove SDL2 code.

  Commit: ce0eb4fa644cbfc5465d07b685288e0b298fb680
      https://github.com/wesnoth/wesnoth/commit/ce0eb4fa644cbfc5465d07b685288e0b298fb680
  Author: Boldizsár Lipka <lipkab at zoho.com>
  Date:   2014-07-03 (Thu, 03 Jul 2014)

  Changed paths:
    M src/sdl/texture.cpp
    M src/sdl/texture.hpp

  Log Message:
  -----------
  Remove SDL2 code.

  Commit: d89eba62595ce50983ac7871cab52714ed0868e5
      https://github.com/wesnoth/wesnoth/commit/d89eba62595ce50983ac7871cab52714ed0868e5
  Author: Boldizsár Lipka <lipkab at zoho.com>
  Date:   2014-07-04 (Fri, 04 Jul 2014)

  Changed paths:
    M src/storyscreen/render.cpp

  Log Message:
  -----------
  SDL_gpu implementation for titlebox.

  Commit: 03c50ba999cd4c11e8cdcba6bae305ddc62d092f
      https://github.com/wesnoth/wesnoth/commit/03c50ba999cd4c11e8cdcba6bae305ddc62d092f
  Author: Boldizsár Lipka <lipkab at zoho.com>
  Date:   2014-07-04 (Fri, 04 Jul 2014)

  Changed paths:
    M src/sdl/texture.cpp

  Log Message:
  -----------
  Return scaled dimensions in width() and height().

  Commit: 496410023917f31a3f99afa739ebcee3306e4b5e
      https://github.com/wesnoth/wesnoth/commit/496410023917f31a3f99afa739ebcee3306e4b5e
  Author: Boldizsár Lipka <lipkab at zoho.com>
  Date:   2014-07-04 (Fri, 04 Jul 2014)

  Changed paths:
    M src/storyscreen/render.cpp

  Log Message:
  -----------
  SDL_gpu implementation for story box.

  Commit: fabb0d5fde176622e8c7ca656c09a2d79950c463
      https://github.com/wesnoth/wesnoth/commit/fabb0d5fde176622e8c7ca656c09a2d79950c463
  Author: Boldizsár Lipka <lipkab at zoho.com>
  Date:   2014-07-04 (Fri, 04 Jul 2014)

  Changed paths:
    M src/storyscreen/render.cpp

  Log Message:
  -----------
  Fix title and story text background alpha.

  Commit: e0462f165fd4c2e706eda67f4f73c8de6cde7d3e
      https://github.com/wesnoth/wesnoth/commit/e0462f165fd4c2e706eda67f4f73c8de6cde7d3e
  Author: Boldizsár Lipka <lipkab at zoho.com>
  Date:   2014-07-04 (Fri, 04 Jul 2014)

  Changed paths:
    M src/storyscreen/render.cpp

  Log Message:
  -----------
  Fix title position.

  Commit: d25e6a852de85b9148e7a1d1f8e400f0b014d1f9
      https://github.com/wesnoth/wesnoth/commit/d25e6a852de85b9148e7a1d1f8e400f0b014d1f9
  Author: Boldizsár Lipka <lipkab at zoho.com>
  Date:   2014-07-04 (Fri, 04 Jul 2014)

  Changed paths:
    M src/storyscreen/render.cpp

  Log Message:
  -----------
  Remove an obsoleted comment.

  Commit: a025c719bf7f71aea91f9d04db43062cf9488ca6
      https://github.com/wesnoth/wesnoth/commit/a025c719bf7f71aea91f9d04db43062cf9488ca6
  Author: Boldizsár Lipka <lipkab at zoho.com>
  Date:   2014-07-04 (Fri, 04 Jul 2014)

  Changed paths:
    M src/storyscreen/render.cpp

  Log Message:
  -----------
  Remove some unnecessary GPU_Flip calls.

  Commit: 0798557507762db9ec331511aa0fa6b416891b57
      https://github.com/wesnoth/wesnoth/commit/0798557507762db9ec331511aa0fa6b416891b57
  Author: Boldizsár Lipka <lipkab at zoho.com>
  Date:   2014-07-05 (Sat, 05 Jul 2014)

  Changed paths:
    M CMakeLists.txt
    M src/CMakeLists.txt
    A src/SDL_gpu/CMakeLists.txt
    A src/SDL_gpu/CMake_scripts/FindFFMPEG.cmake
    A src/SDL_gpu/CMake_scripts/FindOpenGLES.cmake
    A src/SDL_gpu/CMake_scripts/FindPkgMacros.cmake
    A src/SDL_gpu/CMake_scripts/FindSDL2.cmake
    A src/SDL_gpu/Doxyfile
    A src/SDL_gpu/README-wesnoth
    A src/SDL_gpu/README.txt
    A src/SDL_gpu/SDL_gpu/Android.mk
    A src/SDL_gpu/SDL_gpu/CMakeLists.txt
    A src/SDL_gpu/SDL_gpu/GLES_1/SDL_gpu_GLES_1.c
    A src/SDL_gpu/SDL_gpu/GLES_1/SDL_gpu_GLES_1.h
    A src/SDL_gpu/SDL_gpu/GLES_2/SDL_gpu_GLES_2.c
    A src/SDL_gpu/SDL_gpu/GLES_2/SDL_gpu_GLES_2.h
    A src/SDL_gpu/SDL_gpu/GL_common/SDL_gpuShapes_GL_common.inl
    A src/SDL_gpu/SDL_gpu/GL_common/SDL_gpu_GL_common.inl
    A src/SDL_gpu/SDL_gpu/GL_common/SDL_gpu_GL_matrix.c
    A src/SDL_gpu/SDL_gpu/GL_common/SDL_gpu_GL_matrix.h
    A src/SDL_gpu/SDL_gpu/OpenGL_1/SDL_gpu_OpenGL_1.c
    A src/SDL_gpu/SDL_gpu/OpenGL_1/SDL_gpu_OpenGL_1.h
    A src/SDL_gpu/SDL_gpu/OpenGL_1_BASE/SDL_gpu_OpenGL_1_BASE.c
    A src/SDL_gpu/SDL_gpu/OpenGL_1_BASE/SDL_gpu_OpenGL_1_BASE.h
    A src/SDL_gpu/SDL_gpu/OpenGL_2/SDL_gpu_OpenGL_2.c
    A src/SDL_gpu/SDL_gpu/OpenGL_2/SDL_gpu_OpenGL_2.h
    A src/SDL_gpu/SDL_gpu/OpenGL_3/SDL_gpu_OpenGL_3.c
    A src/SDL_gpu/SDL_gpu/OpenGL_3/SDL_gpu_OpenGL_3.h
    A src/SDL_gpu/SDL_gpu/SDL_gpu.c
    A src/SDL_gpu/SDL_gpu/SDL_gpu.h
    A src/SDL_gpu/SDL_gpu/SDL_gpuConfig.cmake
    A src/SDL_gpu/SDL_gpu/SDL_gpuShapes.c
    A src/SDL_gpu/SDL_gpu/SDL_gpu_Renderer.c
    A src/SDL_gpu/SDL_gpu/externals/glew/glew.c
    A src/SDL_gpu/SDL_gpu/externals/glew/glew.h
    A src/SDL_gpu/SDL_gpu/externals/glew/glxew.h
    A src/SDL_gpu/SDL_gpu/externals/glew/wglew.h
    A src/SDL_gpu/SDL_gpu/externals/stb_image/stb_image.c
    A src/SDL_gpu/SDL_gpu/externals/stb_image/stb_image.h
    A src/SDL_gpu/SDL_gpu/externals/stb_image/stb_image_write.c
    A src/SDL_gpu/SDL_gpu/externals/stb_image/stb_image_write.h
    A src/SDL_gpu/SDL_gpu/mainpage.dox
    M src/image.cpp
    M src/image.hpp
    M src/loadscreen.cpp
    M src/loadscreen.hpp
    A src/sdl/gpu.hpp
    M src/sdl/rect.cpp
    M src/sdl/rect.hpp
    M src/sdl/texture.cpp
    M src/sdl/texture.hpp
    M src/storyscreen/part.cpp
    M src/storyscreen/part.hpp
    M src/storyscreen/render.cpp
    M src/storyscreen/render.hpp
    M src/text.cpp
    M src/text.hpp
    M src/video.cpp
    M src/video.hpp

  Log Message:
  -----------
  Merge branch 'SDL_gpu'

Conflicts:
	.gitignore

Compare: https://github.com/wesnoth/wesnoth/compare/daa48e0dce02...079855750776