Correcting Valign and Halign value
Description:
Open source using different Valign values then closed source.
As per specifications valign value should not be zero.
Increment DLL version.
Change-Id: I966d4c81b737e622a0a7d56dc051084626648f32
diff --git a/Source/GmmLib/CMakeLists.txt b/Source/GmmLib/CMakeLists.txt
index 4f7d8d4..57695d8 100644
--- a/Source/GmmLib/CMakeLists.txt
+++ b/Source/GmmLib/CMakeLists.txt
@@ -24,11 +24,11 @@
project(igfx_gmmumd)
# GmmLib Api Version used for so naming
-set(GMMLIB_API_MAJOR_VERSION 5)
+set(GMMLIB_API_MAJOR_VERSION 6)
set(GMMLIB_API_MINOR_VERSION 0)
if(NOT DEFINED MAJOR_VERSION)
- set(MAJOR_VERSION 5)
+ set(MAJOR_VERSION 6)
endif()
if(NOT DEFINED MINOR_VERSION)
diff --git a/Source/GmmLib/inc/External/Common/GmmLibDllName.h b/Source/GmmLib/inc/External/Common/GmmLibDllName.h
index 498073a..5afbde4 100755
--- a/Source/GmmLib/inc/External/Common/GmmLibDllName.h
+++ b/Source/GmmLib/inc/External/Common/GmmLibDllName.h
@@ -29,7 +29,7 @@
#if defined(_WIN64)
#define GMM_UMD_DLL "igdgmm64.dll"
#else
- #define GMM_UMD_DLL "libigdgmm.so.5"
+ #define GMM_UMD_DLL "libigdgmm.so.6"
#endif
#else
#define GMM_ENTRY_NAME "_OpenGmm@4"
@@ -40,6 +40,6 @@
#if defined(_WIN32)
#define GMM_UMD_DLL "igdgmm32.dll"
#else
- #define GMM_UMD_DLL "libigdgmm.so.5"
+ #define GMM_UMD_DLL "libigdgmm.so.6"
#endif
#endif
diff --git a/Source/GmmLib/inc/External/Common/GmmResourceInfoCommon.h b/Source/GmmLib/inc/External/Common/GmmResourceInfoCommon.h
index 72d7700..9df3795 100644
--- a/Source/GmmLib/inc/External/Common/GmmResourceInfoCommon.h
+++ b/Source/GmmLib/inc/External/Common/GmmResourceInfoCommon.h
@@ -1285,7 +1285,7 @@
{
if (GetResFlags().Info.TiledYf || GMM_IS_64KB_TILE(GetResFlags()))
{
- HAlign = 0;
+ HAlign = 1; //Ignored, but we'll retrun valid encoding nonetheless.
}
else
{
@@ -1294,7 +1294,7 @@
case 4: HAlign = 1; break;
case 8: HAlign = 2; break;
case 16: HAlign = 3; break;
- default: HAlign = 0; __GMM_ASSERT(0);
+ default: HAlign = 1;
}
}
}
@@ -1326,7 +1326,7 @@
{
if (GetResFlags().Info.TiledYf || GMM_IS_64KB_TILE(GetResFlags()))
{
- VAlign = 0;
+ VAlign = 1; // Ignored , but we'll return valid encoding nonetheless.
}
else
{
@@ -1335,7 +1335,7 @@
case 4: VAlign = 1; break;
case 8: VAlign = 2; break;
case 16: VAlign = 3; break;
- default: VAlign = 0; __GMM_ASSERT(0);
+ default: VAlign = 1;
}
}
}
