[SCM] Allegro branch 5.1 updated. 5.1.4-27-gf7c31aa

[Michał Cichoń <th...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Allegro".

The branch, 5.1 has been updated
       via  f7c31aacc55e18839edf00f5e24ad4a50bab7b27 (commit)
       via  eeeaa977830233ad972b0aa8e4304e9171b0a524 (commit)
      from  f25da9a0bb60ade223ef581840732703c23a0820 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f7c31aacc55e18839edf00f5e24ad4a50bab7b27
Author: Michał Cichoń <th...@us...>
Date:   Sat Nov 3 17:11:36 2012 +0100

    Explain the range of versions of d3dx9_xx.dll libraries.

commit eeeaa977830233ad972b0aa8e4304e9171b0a524
Author: Michał Cichoń <th...@us...>
Date:   Sat Nov 3 17:10:16 2012 +0100

    Comment out sanity check and honor any value read from configuration file.

-----------------------------------------------------------------------

Summary of changes:
 addons/shader/shader_hlsl.cpp |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/addons/shader/shader_hlsl.cpp b/addons/shader/shader_hlsl.cpp
index 0041b8e..f64a343 100644
--- a/addons/shader/shader_hlsl.cpp
+++ b/addons/shader/shader_hlsl.cpp
@@ -68,10 +68,14 @@ static bool _imp_load_d3dx9_module_version(int version)
    char module_name[16];
 
    // Sanity check
+   // Comented out, to not reject choice of the user if any new version
+   // appears. See force_d3dx9_version entry in config file.
+   /*
    if (version < 24 || version > 43) {
       ALLEGRO_ERROR("Error: Requested version (%d) of D3DX9 library is invalid.\n", version);
       return false;
    }
+   */
 
    sprintf(module_name, "d3dx9_%d.dll", version);
 
@@ -116,6 +120,15 @@ static bool _imp_load_d3dx9_module()
    }
 
    // Iterate over all valid versions.
+   //
+   // DXSDK redistributable install d3dx9_xx.dll from version
+   // 24 to 43. It's unlikely that any new version will come,
+   // since HLSL compiler was moved to D3DCompiler_xx.dll and
+   // most recent versions of this utility library are bound
+   // to DirectX 11.
+   //
+   // However, if any new version appears anyway, range in this
+   // loop should be changed.
    for (version = 43; version >= 24; --version)
       if (_imp_load_d3dx9_module_version((int)version))
          return true;


hooks/post-receive
-- 
Allegro