Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19942e77 authored by Chia-I Wu's avatar Chia-I Wu Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'hwc-vts' 

* changes:
  graphics: add composer tests to VTS
  graphics: add basic target-side tests for IComposer
parents 4a1c7b57 b00f59df

graphics/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ subdirs = [ 
    "common/1.0",

    "composer/2.1",

    "composer/2.1/default",

    "composer/2.1/vts/functional",

    "mapper/2.0",

    "mapper/2.0/default",

    "mapper/2.0/vts/functional",

graphics/composer/2.1/Android.mk

0 → 100644
+19 −0
Original line number Diff line number Diff line 
#

# Copyright (C) 2016 The Android Open Source Project

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.

#



LOCAL_PATH := $(call my-dir)



include $(call all-subdir-makefiles)

graphics/composer/2.1/IComposer.hal

+8 −0
Original line number Diff line number Diff line
@@ -53,6 +53,9 @@ interface IComposer { 
     *

     * @return capabilities is a list of supported capabilities.

     */

    @entry

    @exit

    @callflow(next="*")

    getCapabilities() generates (vec<Capability> capabilities);



    /*
@@ -61,6 +64,9 @@ interface IComposer { 
     *

     * @return debugInfo is a string of debug information.

     */

    @entry

    @exit

    @callflow(next="*")

    dumpDebugInfo() generates (string debugInfo);



    /*
@@ -73,5 +79,7 @@ interface IComposer { 
     *         NO_RESOURCES when no more client can be created currently.

     * @return client is the newly created client.

     */

    @entry

    @callflow(next="*")

    createClient() generates (Error error, IComposerClient client);

};

graphics/composer/2.1/IComposerCallback.hal

+3 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ interface IComposerCallback { 
     * @param connected indicates whether the display is connected or

     *        disconnected.

     */

    @callflow(next="*")

    onHotplug(Display display, Connection connected);



    /*
@@ -57,6 +58,7 @@ interface IComposerCallback { 
     *

     * @param display is the display to refresh.

     */

    @callflow(next="*")

    oneway onRefresh(Display display);



    /*
@@ -68,5 +70,6 @@ interface IComposerCallback { 
     * @param timestamp is the CLOCK_MONOTONIC time at which the vsync event

     *        occurred, in nanoseconds.

     */

    @callflow(next="*")

    oneway onVsync(Display display, int64_t timestamp);

};

graphics/composer/2.1/IComposerClient.hal

+24 −0
Original line number Diff line number Diff line
@@ -240,6 +240,8 @@ interface IComposerClient { 
     *

     * @param callback is the IComposerCallback object.

     */

    @entry

    @callflow(next="*")

    registerCallback(IComposerCallback callback);



    /*
@@ -250,6 +252,7 @@ interface IComposerClient { 
     *

     * @return count is the maximum number of virtual displays supported.

     */

    @callflow(next="*")

    getMaxVirtualDisplayCount() generates (uint32_t count);



    /*
@@ -274,6 +277,7 @@ interface IComposerClient { 
     * @return display is the newly-created virtual display.

     * @return format is the format of the buffer the device will produce.

     */

    @callflow(next="*")

    createVirtualDisplay(uint32_t width,

                         uint32_t height,

                         PixelFormat formatHint,
@@ -293,6 +297,7 @@ interface IComposerClient { 
     *         BAD_PARAMETER when the display handle which was passed in does

     *                       not refer to a virtual display.

     */

    @callflow(next="*")

    destroyVirtualDisplay(Display display) generates (Error error);



    /*
@@ -306,6 +311,7 @@ interface IComposerClient { 
     *                      time.

     * @return layer is the handle of the new layer.

     */

    @callflow(next="*")

    createLayer(Display display,

                uint32_t bufferSlotCount)

     generates (Error error,
@@ -320,6 +326,7 @@ interface IComposerClient { 
     *         BAD_DISPLAY when an invalid display handle was passed in.

     *         BAD_LAYER when an invalid layer handle was passed in.

     */

    @callflow(next="*")

    destroyLayer(Display display, Layer layer) generates (Error error);



    /*
@@ -336,6 +343,7 @@ interface IComposerClient { 
     *         BAD_CONFIG when no configuration is currently active.

     * @return config is the currently active display configuration.

     */

    @callflow(next="*")

    getActiveConfig(Display display) generates (Error error, Config config);



    /*
@@ -357,6 +365,7 @@ interface IComposerClient { 
     *         BAD_DISPLAY when an invalid display handle was passed in.

     *         UNSUPPORTED when the given configuration is not supported.

     */

    @callflow(next="*")

    getClientTargetSupport(Display display,

                           uint32_t width,

                           uint32_t height,
@@ -374,6 +383,7 @@ interface IComposerClient { 
     *         BAD_DISPLAY when an invalid display handle was passed in.

     * @return modes is an array of color modes.

     */

    @callflow(next="*")

    getColorModes(Display display)

       generates (Error error,

                  vec<ColorMode> modes);
@@ -393,6 +403,7 @@ interface IComposerClient { 
     *         UNSUPPORTED when attribute cannot be queried for the config.

     * @return value is the value of the attribute.

     */

    @callflow(next="*")

    getDisplayAttribute(Display display,

                        Config config,

                        Attribute attribute)
@@ -408,6 +419,7 @@ interface IComposerClient { 
     *         BAD_DISPLAY when an invalid display handle was passed in.

     * @return configs is an array of configuration handles.

     */

    @callflow(next="*")

    getDisplayConfigs(Display display)

           generates (Error error,

                      vec<Config> configs);
@@ -419,6 +431,7 @@ interface IComposerClient { 
     *         BAD_DISPLAY when an invalid display handle was passed in.

     * @return name is the name of the display.

     */

    @callflow(next="*")

    getDisplayName(Display display) generates (Error error, string name);



    /*
@@ -429,6 +442,7 @@ interface IComposerClient { 
     *         BAD_DISPLAY when an invalid display handle was passed in.

     * @return type is the type of the display.

     */

    @callflow(next="*")

    getDisplayType(Display display) generates (Error error, DisplayType type);



    /*
@@ -443,6 +457,7 @@ interface IComposerClient { 
     *         BAD_DISPLAY when an invalid display handle was passed in.

     * @return support is true only when the display supports doze modes.

     */

    @callflow(next="*")

    getDozeSupport(Display display) generates (Error error, bool support);



    /*
@@ -463,6 +478,7 @@ interface IComposerClient { 
     * @return minLuminance is the desired content minimum luminance for this

     *         display in cd/m^2.

     */

    @callflow(next="*")

    getHdrCapabilities(Display display)

            generates (Error error,

                       vec<Hdr> types,
@@ -479,6 +495,7 @@ interface IComposerClient { 
     *         BAD_DISPLAY when an invalid display handle was passed in.

     *         NO_RESOURCES when unable to reserve the slots.

     */

    @callflow(next="*")

    setClientTargetSlotCount(Display display,

                             uint32_t clientTargetSlotCount)

                  generates (Error error);
@@ -495,6 +512,7 @@ interface IComposerClient { 
     *         BAD_CONFIG when the configuration handle passed in is not valid

     *                    for this display.

     */

    @callflow(next="*")

    setActiveConfig(Display display, Config config) generates (Error error);



    /*
@@ -513,6 +531,7 @@ interface IComposerClient { 
     *         BAD_PARAMETER when mode is not a valid color mode.

     *         UNSUPPORTED when mode is not supported on this display.

     */

    @callflow(next="*")

    setColorMode(Display display, ColorMode mode) generates (Error error);



    /*
@@ -531,6 +550,7 @@ interface IComposerClient { 
     *         BAD_PARAMETER when mode was not a valid power mode.

     *         UNSUPPORTED when mode is not supported on this display.

     */

    @callflow(next="*")

    setPowerMode(Display display, PowerMode mode) generates (Error error);



    /*
@@ -545,6 +565,7 @@ interface IComposerClient { 
     *         BAD_DISPLAY when an invalid display handle was passed in.

     *         BAD_PARAMETER when enabled was an invalid value.

     */

    @callflow(next="*")

    setVsyncEnabled(Display display, Vsync enabled) generates (Error error);



    /*
@@ -554,6 +575,7 @@ interface IComposerClient { 
     * @return error is NONE upon success. Otherwise,

     *         NO_RESOURCES when failed to set the queue temporarily.

     */

    @callflow(next="*")

    setInputCommandQueue(fmq_sync<uint32_t> descriptor)

              generates (Error error);
@@ -566,6 +588,7 @@ interface IComposerClient { 
     *         NO_RESOURCES when failed to get the queue temporarily.

     * @return descriptor is the descriptor of the output command queue.

     */

    @callflow(next="*")

    getOutputCommandQueue()

              generates (Error error,

                         fmq_sync<uint32_t> descriptor);
@@ -589,6 +612,7 @@ interface IComposerClient { 
     * @param outHandles is an array of handles referenced by the output

     *        commands.

     */

    @callflow(next="*")

    executeCommands(uint32_t inLength,

                    vec<handle> inHandles)

         generates (Error error,