diff options
5 files changed, 3 insertions, 54 deletions
diff --git a/ivi-layermanagement-api/ilmControl/include/ilm_control.h b/ivi-layermanagement-api/ilmControl/include/ilm_control.h index d0ddef7..3fa1ad3 100644 --- a/ivi-layermanagement-api/ilmControl/include/ilm_control.h +++ b/ivi-layermanagement-api/ilmControl/include/ilm_control.h @@ -47,16 +47,6 @@ ilmErrorTypes ilm_getPropertiesOfLayer(t_ilm_uint layerID, struct ilmLayerProper ilmErrorTypes ilm_getPropertiesOfScreen(t_ilm_display screenID, struct ilmScreenProperties* pScreenProperties); /** - * \brief Get the number of hardware layers of a screen - * \ingroup ilmControl - * \param[in] screenID id of the screen, where the number of Hardware Layers should be returned - * \param[out] pNumberOfHardwareLayers pointer where the number of hardware layers should be stored - * \return ILM_SUCCESS if the method call was successful - * \return ILM_FAILED if the client can not get the resolution. - */ -ilmErrorTypes ilm_getNumberOfHardwareLayers(t_ilm_uint screenID, t_ilm_uint* pNumberOfHardwareLayers); - -/** * \brief Get the screen Ids * \ingroup ilmControl * \param[out] pNumberOfIDs pointer where the number of Screen Ids should be returned diff --git a/ivi-layermanagement-api/ilmControl/include/ilm_control_platform.h b/ivi-layermanagement-api/ilmControl/include/ilm_control_platform.h index 6d92763..07199c0 100644 --- a/ivi-layermanagement-api/ilmControl/include/ilm_control_platform.h +++ b/ivi-layermanagement-api/ilmControl/include/ilm_control_platform.h @@ -30,8 +30,6 @@ typedef struct _ILM_CONTROL_PLATFORM_FUNC struct ilmLayerProperties* pLayerProperties); ilmErrorTypes (*getPropertiesOfScreen)(t_ilm_display screenID, struct ilmScreenProperties* pScreenProperties); - ilmErrorTypes (*getNumberOfHardwareLayers)(t_ilm_uint screenID, - t_ilm_uint* pNumberOfHardwareLayers); ilmErrorTypes (*getScreenIDs)(t_ilm_uint* pNumberOfIDs, t_ilm_uint** ppIDs); ilmErrorTypes (*getLayerIDs)(t_ilm_int* pLength, diff --git a/ivi-layermanagement-api/ilmControl/src/ilm_control_wayland_platform.c b/ivi-layermanagement-api/ilmControl/src/ilm_control_wayland_platform.c index 71ad142..97a96da 100644 --- a/ivi-layermanagement-api/ilmControl/src/ilm_control_wayland_platform.c +++ b/ivi-layermanagement-api/ilmControl/src/ilm_control_wayland_platform.c @@ -1421,20 +1421,6 @@ ilm_getPropertiesOfScreen(t_ilm_display screenID, } ILM_EXPORT ilmErrorTypes -ilm_getNumberOfHardwareLayers(t_ilm_uint screenID, - t_ilm_uint* pNumberOfHardwareLayers) -{ - (void)screenID; - /* Not supported */ - if (pNumberOfHardwareLayers != NULL) { - *pNumberOfHardwareLayers = 0; - return ILM_SUCCESS; - } else { - return ILM_FAILED; - } -} - -ILM_EXPORT ilmErrorTypes ilm_getScreenIDs(t_ilm_uint* pNumberOfIDs, t_ilm_uint** ppIDs) { ilmErrorTypes returnValue = ILM_FAILED; diff --git a/ivi-layermanagement-api/test/ilm_control_test.cpp b/ivi-layermanagement-api/test/ilm_control_test.cpp index f1ee1f2..00309de 100644 --- a/ivi-layermanagement-api/test/ilm_control_test.cpp +++ b/ivi-layermanagement-api/test/ilm_control_test.cpp @@ -966,27 +966,6 @@ TEST_F(IlmCommandTest, ilm_input_event_acceptance) { EXPECT_NE(surface1, surface); } -TEST_F(IlmCommandTest, ilm_getNumberOfHardwareLayers) { - t_ilm_uint numberOfScreens = 0; - t_ilm_uint* screenIDs = NULL; - ASSERT_EQ(ILM_SUCCESS, ilm_getScreenIDs(&numberOfScreens, &screenIDs)); - EXPECT_TRUE(numberOfScreens>0); - - if (numberOfScreens > 0) - { - t_ilm_display screen = screenIDs[0]; - t_ilm_uint numberOfHardwareLayers; - - // Depends on the platform the test is executed on - just check if the - // function doesn't fail. The ilm_getPropertiesOfScreen test does a more - // comprehensive verification. - EXPECT_EQ(ILM_SUCCESS, ilm_getNumberOfHardwareLayers(screen, &numberOfHardwareLayers)); - EXPECT_GT(numberOfHardwareLayers, 0u); - } - - free(screenIDs); -} - TEST_F(IlmCommandTest, ilm_getPropertiesOfScreen) { t_ilm_uint numberOfScreens = 0; t_ilm_uint* screenIDs = NULL; @@ -1022,10 +1001,6 @@ TEST_F(IlmCommandTest, ilm_getPropertiesOfScreen) { EXPECT_GT(screenProperties.screenWidth, 0u); EXPECT_GT(screenProperties.screenHeight, 0u); - - t_ilm_uint numberOfHardwareLayers; - EXPECT_EQ(ILM_SUCCESS, ilm_getNumberOfHardwareLayers(screen, &numberOfHardwareLayers)); - EXPECT_EQ(numberOfHardwareLayers, screenProperties.harwareLayerCount); } free(screenIDs); diff --git a/ivi-layermanagement-examples/LayerManagerControl/src/control.cpp b/ivi-layermanagement-examples/LayerManagerControl/src/control.cpp index b7efbc1..f8fd7d4 100644 --- a/ivi-layermanagement-examples/LayerManagerControl/src/control.cpp +++ b/ivi-layermanagement-examples/LayerManagerControl/src/control.cpp @@ -53,7 +53,7 @@ void getCommunicatorPerformance() { int runs = 0; int runtimeInSec = 5; - unsigned int hwLayerCnt = 0; + ilmScreenProperties screenProperties; cout << "running performance test for " << runtimeInSec << " seconds... "; flush(cout); @@ -67,11 +67,11 @@ void getCommunicatorPerformance() { t_ilm_uint screenid = 0; - ilmErrorTypes callResult = ilm_getNumberOfHardwareLayers(screenid, &hwLayerCnt); + ilmErrorTypes callResult = ilm_getPropertiesOfScreen(screenid, &screenProperties); if (ILM_SUCCESS != callResult) { cout << "LayerManagerService returned: " << ILM_ERROR_STRING(callResult) << "\n"; - cout << "Failed to get number of hardware layers for screen with ID " << screenid << "\n"; + cout << "Failed to get properties for screen with ID " << screenid << "\n"; return; } |